You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/08/15 21:28:58 UTC
svn commit: r1373595 - in /tomcat/trunk/java/org/apache/coyote/ajp:
AbstractAjpProtocol.java AjpNioProtocol.java LocalStrings.properties
Author: markt
Date: Wed Aug 15 19:28:57 2012
New Revision: 1373595
URL: http://svn.apache.org/viewvc?rev=1373595&view=rev
Log:
Fix unused StringManager by using it.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1373595&r1=1373594&r2=1373595&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Wed Aug 15 19:28:57 2012
@@ -28,7 +28,7 @@ public abstract class AbstractAjpProtoco
* The string manager for this package.
*/
protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
+ StringManager.getManager(Constants.Package);
@Override
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1373595&r1=1373594&r2=1373595&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Wed Aug 15 19:28:57 2012
@@ -121,7 +121,7 @@ public class AjpNioProtocol extends Abst
@Override
public void release(SocketChannel socket) {
if (log.isDebugEnabled())
- log.debug("Iterating through our connections to release a socket channel:"+socket);
+ log.debug(sm.getString("ajpnioprotocol.releaseStart", socket));
boolean released = false;
Iterator<java.util.Map.Entry<NioChannel, Processor<NioChannel>>> it = connections.entrySet().iterator();
while (it.hasNext()) {
@@ -136,7 +136,8 @@ public class AjpNioProtocol extends Abst
}
}
if (log.isDebugEnabled())
- log.debug("Done iterating through our connections to release a socket channel:"+socket +" released:"+released);
+ log.debug(sm.getString("ajpnioprotocol.releaseEnd",
+ socket, Boolean.valueOf(released)));
}
/**
Modified: tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties?rev=1373595&r1=1373594&r2=1373595&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties Wed Aug 15 19:28:57 2012
@@ -12,6 +12,9 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+ajpnioprotocol.releaseStart=Iterating through our connections to release a socket channel [{0}]
+ajpnioprotocol.releaseEnd=Done iterating through our connections to release a socket channel [{0}] released [{1}]
+
ajpprocessor.failedread=Socket read failed
ajpprocessor.failedsend=Failed to send AJP message
ajpprocessor.header.error=Header message parsing failed
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org