Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cxf.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1360676 - in
 /cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http:
 HTTPConduit.java Messages.properties
Date: Thu, 12 Jul 2012 13:47:40 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
Message-Id: <20120712134740.21DB62388A33@eris.apache.org>

Author: dkulp
Date: Thu Jul 12 13:47:39 2012
New Revision: 1360676

URL: http://svn.apache.org/viewvc?rev=1360676&view=rev
Log:
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.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
    cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties

Modified: cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1360676&r1=1360675&r2=1360676&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original)
+++ cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Thu Jul 12 13:47:39 2012
@@ -171,6 +171,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 
@@ -1567,7 +1569,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.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties?rev=1360676&r1=1360675&r2=1360676&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties (original)
+++ cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties Thu Jul 12 13:47:39 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