You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/07/17 16:42:42 UTC

svn commit: r1362519 - in /cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http: HTTPConduit.java Messages.properties

Author: dkulp
Date: Tue Jul 17 14:42:42 2012
New Revision: 1362519

URL: http://svn.apache.org/viewvc?rev=1362519&view=rev
Log:
Merged revisions 1360700 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

........
  r1360700 | dkulp | 2012-07-12 10:28:58 -0400 (Thu, 12 Jul 2012) | 18 lines

  Merged revisions 1360676 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

  ........
    r1360676 | dkulp | 2012-07-12 09:47:39 -0400 (Thu, 12 Jul 2012) | 10 lines

    Merged revisions 1360405 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk

    ........
      r1360405 | dkulp | 2012-07-11 17:15:44 -0400 (Wed, 11 Jul 2012) | 2 lines

      Only log the warning level once to avoid flooding the logs.

    ........

  ........

........

Modified:
    cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
    cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties

Modified: cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1362519&r1=1362518&r2=1362519&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original)
+++ cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Tue Jul 17 14:42:42 2012
@@ -170,6 +170,8 @@ public class HTTPConduit 
      * The Logger for this class.
      */
     private static final Logger LOG = LogUtils.getL7dLogger(HTTPConduit.class);
+
+    private static boolean hasLoggedAsyncWarning;
     
     /**
      * This constant holds the suffix ".http-conduit" that is appended to the 
@@ -1553,7 +1555,11 @@ public class HTTPConduit 
                         && policy.isAsyncExecuteTimeoutRejection()) {
                         throw rex;
                     }
-                    LOG.warning("EXECUTOR_FULL");
+                    if (!hasLoggedAsyncWarning) {
+                        LOG.warning("EXECUTOR_FULL_WARNING");
+                        hasLoggedAsyncWarning = true;
+                    }
+                    LOG.fine("EXECUTOR_FULL");
                     handleResponseInternal();
                 }
             }

Modified: cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties?rev=1362519&r1=1362518&r2=1362519&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties (original)
+++ cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties Tue Jul 17 14:42:42 2012
@@ -26,4 +26,5 @@ MISSING_PATH_INFO = PATH_INFO not presen
 INVALID_ENCODING_MSG = Invalid character set {0} in request.
 INVALID_TIMEOUT_FORMAT = Invalid name/value pair {0}={1} set in RequestConext 
 NO_HTTP_DESTINATION_FACTORY_FOUND = Cannot find any registered HttpDestinationFactory from the Bus.
-EXECUTOR_FULL = Executor rejected background task to retrieve the response, running on current thread.
\ No newline at end of file
+EXECUTOR_FULL = Executor rejected background task to retrieve the response, running on current thread.
+EXECUTOR_FULL_WARNING = Executor rejected background task to retrieve the response.  Suggest increasing the workqueue settings.
\ No newline at end of file