1.1 --- a/openide.util/src/org/openide/util/WeakListenerImpl.java	Wed Feb 11 16:15:11 2009 +0100
     1.2 +++ b/openide.util/src/org/openide/util/WeakListenerImpl.java	Wed Feb 11 16:32:49 2009 +0100
     1.3 @@ -52,6 +52,7 @@
     1.4  import java.lang.ref.WeakReference;
     1.5  import java.lang.reflect.Constructor;
     1.6  import java.lang.reflect.InvocationHandler;
     1.7 +import java.lang.reflect.InvocationTargetException;
     1.8  import java.lang.reflect.Method;
     1.9  import java.lang.reflect.Modifier;
    1.10  import java.lang.reflect.Proxy;
    1.11 @@ -583,10 +584,13 @@
    1.12              try {
    1.13                  remove.invoke(src, params);
    1.14              } catch (Exception ex) { // from invoke(), should not happen
    1.15 -                LOG.warning(
    1.16 -                    "Problem encountered while calling " + methodClass + "." + methodName + "(...) on " + src
    1.17 -                ); // NOI18N
    1.18 -                LOG.log(Level.WARNING, null, ex);
    1.19 +                String errMessage = "Problem encountered while calling " + methodClass + "." + methodName + "(...) on " + src; // NOI18N
    1.20 +                LOG.warning( errMessage );
    1.21 +                //detailed logging needed in some cases
    1.22 +                boolean showErrMessage = ex instanceof InvocationTargetException
    1.23 +                        || "object is not an instance of declaring class".equals(ex.getMessage());
    1.24 +
    1.25 +                LOG.log(Level.WARNING, showErrMessage ? errMessage : null, ex);
    1.26              }
    1.27          }
    1.28  

     2.1 --- a/openide.util/src/org/openide/xml/EntityCatalog.java	Wed Feb 11 16:15:11 2009 +0100
     2.2 +++ b/openide.util/src/org/openide/xml/EntityCatalog.java	Wed Feb 11 16:32:49 2009 +0100
     2.3 @@ -41,6 +41,7 @@
     2.4  
     2.5  package org.openide.xml;
     2.6  
     2.7 +import java.awt.EventQueue;
     2.8  import java.io.IOException;
     2.9  import java.util.logging.Level;
    2.10  import java.util.logging.Logger;
    2.11 @@ -116,7 +117,10 @@
    2.12              }
    2.13  
    2.14              if (systemID != null && systemID.startsWith("http")) { // NOI18N
    2.15 -                Logger.getLogger(EntityCatalog.class.getName()).log(Level.FINE, "No resolver found for {0}", systemID);
    2.16 +                Logger.getLogger(EntityCatalog.class.getName()).log(
    2.17 +                        /* More of a problem when blocking EQ; cf. #157850: */
    2.18 +                        EventQueue.isDispatchThread() ? Level.WARNING : Level.FINE,
    2.19 +                        "No resolver found for {0}", systemID);
    2.20              }
    2.21              return null;
    2.22          }