svn commit: r1790939 - in /tomcat/trunk/java/org/apache/catalina/tribes/transport: ReplicationTransmitter.java nio/PooledParallelSender.java nio/PooledParallelSenderMBean.java
Author: kfujino
Date: Tue Apr 11 08:29:24 2017
New Revision: 1790939
URL: http://svn.apache.org/viewvc?rev=1790939&view=rev
Log:
Add MBean for Sender component.
Added:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSenderMBean.java
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java?rev=1790939&r1=1790938&r2=1790939&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
Tue Apr 11 08:29:24 2017
@@ -16,11 +16,14 @@
*/
package org.apache.catalina.tribes.transport;
+import javax.management.ObjectName;
+
import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ChannelException;
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.ChannelSender;
import org.apache.catalina.tribes.Member;
+import org.apache.catalina.tribes.jmx.JmxRegistry;
import org.apache.catalina.tribes.transport.nio.PooledParallelSender;
/**
@@ -32,6 +35,11 @@ public class ReplicationTransmitter impl
private Channel channel;
+/**
+ * the ObjectName of this Sender.
+ */
+private ObjectName oname = null;
+
public ReplicationTransmitter() {
}
@@ -66,6 +74,9 @@ public class ReplicationTransmitter impl
@Override
public void start() throws java.io.IOException {
getTransport().connect();
+// register jmx
+JmxRegistry jmxRegistry = JmxRegistry.getRegistry(channel);
+if (jmxRegistry != null) this.oname =
jmxRegistry.registerJmx(",component=Sender", transport);
}
/**
@@ -76,6 +87,10 @@ public class ReplicationTransmitter impl
@Override
public synchronized void stop() {
getTransport().disconnect();
+if (oname != null) {
+JmxRegistry.getRegistry(channel).unregisterJmx(oname);
+oname = null;
+}
channel = null;
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java?rev=1790939&r1=1790938&r2=1790939&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
Tue Apr 11 08:29:24 2017
@@ -26,7 +26,7 @@ import org.apache.catalina.tribes.transp
import org.apache.catalina.tribes.transport.PooledSender;
import org.apache.catalina.tribes.util.StringManager;
-public class PooledParallelSender extends PooledSender {
+public class PooledParallelSender extends PooledSender implements
PooledParallelSenderMBean {
protected static final StringManager sm =
StringManager.getManager(PooledParallelSender.class);
@Override
Added:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSenderMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSenderMBean.java?rev=1790939&view=auto
==
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSenderMBean.java
(added)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSenderMBean.java
Tue Apr 11 08:29:24 2017
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package org.apache.catalina.tribes.transport.nio;
+
+public interface PooledParallelSenderMBean {
+
+// Transport Attributes
+public int getRxBufSize();
+
svn commit: r1790946 - /tomcat/trunk/webapps/docs/config/cluster-channel.xml
Author: kfujino Date: Tue Apr 11 09:29:04 2017 New Revision: 1790946 URL: http://svn.apache.org/viewvc?rev=1790946&view=rev Log: Add documents for JMX support of cluster channel. Modified: tomcat/trunk/webapps/docs/config/cluster-channel.xml Modified: tomcat/trunk/webapps/docs/config/cluster-channel.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-channel.xml?rev=1790946&r1=1790945&r2=1790946&view=diff == --- tomcat/trunk/webapps/docs/config/cluster-channel.xml (original) +++ tomcat/trunk/webapps/docs/config/cluster-channel.xml Tue Apr 11 09:29:04 2017 @@ -118,6 +118,22 @@ flag. The default is false. + +Flag whether the channel components register with JMX or not. +The default value is true. + + + +if jmxEnabled set to true, specifies the jmx domain which +this channel should be registered. The ClusterChannel is used as the +default value. + + + +if jmxEnabled set to true, specifies the jmx prefix which +will be used with channel ObjectName. + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Plans for 8.5.14 ?
On 10/04/17 20:29, Konstantin Kolinko wrote: > Hi! > > Is there a plan to tag 8.5.14, not waiting for May 1st? > > My concern is regression in Manager web application, > https://bz.apache.org/bugzilla/show_bug.cgi?id=60949 There isn't, but there can be. How about tagging 9.0.x and 8.5.x tomorrow - roughly 24 hours from now. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 9.0.0.M19
On 30/03/17 20:35, Rainer Jung wrote: > - Exceptions: the biggest difference is more NullPointerException > (about 32 new ones). They seem to happen after the stop was issued and > only for apr and nio, not for nio2. Two cases: > - org.apache.coyote.http11.Http11Processor.endRequest Error > finishing response (20 times) I've got to the bottom of what is causing this. I'm still investigating potential solutions. What happens is: - request processing thread writes the response - main thread reads response and ends the test - ending the test stops the Tomcat instance - that eventually calls stop on the endpoint - the endpoint stops the poller - the poller times out any open connections - timing out the connection recycles the MappingData - all of this happens before the request processing thread gets as far as line 393 in the CoyoteAdapter and that triggers the NPE. > at > org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:393) > at > org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:498) > at > org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:66) > > at > org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:796) > > > Line 393 is: > > request.getMappingData().context.logAccess(request, response, > System.currentTimeMillis() - req.getStartTime(), false); Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 60970] New: Endless loop in Http2UpgradeHandler#writeHeaders
https://bz.apache.org/bugzilla/show_bug.cgi?id=60970 Bug ID: 60970 Summary: Endless loop in Http2UpgradeHandler#writeHeaders Product: Tomcat 8 Version: 8.5.13 Hardware: Macintosh Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: c.wellekoet...@laudert.de Target Milestone: Created attachment 34905 --> https://bz.apache.org/bugzilla/attachment.cgi?id=34905&action=edit A proposal for a fix for the problem. The method Http2UpgradeHandler#writeHeaders runs into an endless loop, if the mime headers to send are too long. Given following situation: In our web app we add additional states as cookies into our request. This is causing a header amount greater than 1024 bytes. In that case the named method needs to run line 540 (state = getHpackEncoder().encode(coyoteResponse.getMimeHeaders(), target);) at least twice. On the first run, the used ByteBuffer will be filled with some data. After that the data are written to the socket output. Now the ByteBuffer claims to have zero bytes left to write, because its position is set to its limit. This causes the next call on line 540 to actually do nothing and writing the same data again. And so the loop continues forever until an exception is thrown. To fix this problem, the ByteBuffer needs to be reset properly before writing new data to it. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 60970] Endless loop in Http2UpgradeHandler#writeHeaders
https://bz.apache.org/bugzilla/show_bug.cgi?id=60970 Christian Wellekötter changed: What|Removed |Added OS||All -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 60970] Endless loop in Http2UpgradeHandler#writeHeaders
https://bz.apache.org/bugzilla/show_bug.cgi?id=60970 Christian Wellekötter changed: What|Removed |Added CC||c.wellekoet...@laudert.de -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1790982 - in /tomcat/trunk/java/org/apache/catalina/tribes: group/GroupChannel.java membership/McastService.java
Author: markt
Date: Tue Apr 11 14:28:02 2017
New Revision: 1790982
URL: http://svn.apache.org/viewvc?rev=1790982&view=rev
Log:
Add missing @Override annotations
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1790982&r1=1790981&r2=1790982&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Tue
Apr 11 14:28:02 2017
@@ -643,6 +643,7 @@ public class GroupChannel extends Channe
* @see #setOptionCheck(boolean)
* @return boolean
*/
+@Override
public boolean getOptionCheck() {
return optionCheck;
}
@@ -651,6 +652,7 @@ public class GroupChannel extends Channe
* @see #setHeartbeat(boolean)
* @return boolean
*/
+@Override
public boolean getHeartbeat() {
return heartbeat;
}
@@ -660,6 +662,7 @@ public class GroupChannel extends Channe
* sleep in between invocations of Channel.heartbeat()
* @return long
*/
+@Override
public long getHeartbeatSleeptime() {
return heartbeatSleeptime;
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1790982&r1=1790981&r2=1790982&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
Tue Apr 11 14:28:02 2017
@@ -136,6 +136,7 @@ public class McastService
/**
* @return the local member name
*/
+@Override
public String getLocalMemberName() {
return localMember.toString() ;
}
@@ -181,6 +182,7 @@ public class McastService
properties.setProperty("mcastAddress", addr);
}
+@Override
public String getAddress() {
return properties.getProperty("mcastAddress");
}
@@ -193,6 +195,7 @@ public class McastService
properties.setProperty("mcastBindAddress", bindaddr);
}
+@Override
public String getBind() {
return properties.getProperty("mcastBindAddress");
}
@@ -205,6 +208,7 @@ public class McastService
properties.setProperty("recoveryCounter",
String.valueOf(recoveryCounter));
}
+@Override
public int getRecoveryCounter(){
String p = properties.getProperty("recoveryCounter");
if(p != null){
@@ -217,6 +221,7 @@ public class McastService
properties.setProperty("recoveryEnabled",
String.valueOf(recoveryEnabled));
}
+@Override
public boolean getRecoveryEnabled() {
String p = properties.getProperty("recoveryEnabled");
if(p != null){
@@ -229,6 +234,7 @@ public class McastService
properties.setProperty("recoverySleepTime",
String.valueOf(recoverySleepTime));
}
+@Override
public long getRecoverySleepTime(){
String p = properties.getProperty("recoverySleepTime");
if(p != null){
@@ -241,6 +247,7 @@ public class McastService
properties.setProperty("localLoopbackDisabled",String.valueOf(localLoopbackDisabled));
}
+@Override
public boolean getLocalLoopbackDisabled() {
String p = properties.getProperty("localLoopbackDisabled");
if(p != null){
@@ -249,6 +256,7 @@ public class McastService
return false;
}
+@Override
public int getPort() {
String p = properties.getProperty("mcastPort");
return Integer.parseInt(p);
@@ -258,6 +266,7 @@ public class McastService
properties.setProperty("mcastFrequency", String.valueOf(time));
}
+@Override
public long getFrequency() {
String p = properties.getProperty("mcastFrequency");
return Long.parseLong(p);
@@ -270,6 +279,7 @@ public class McastService
properties.setProperty("memberDropTime", String.valueOf(time));
}
+@Override
public long getDropTime() {
String p = properties.getProperty("memberDropTime");
return Long.parseLong(p);
@@ -530,6 +540,7 @@ public class McastService
}
}
+@Override
public int getSoTimeout() {
return mcastSoTimeout;
}
@@ -539,6 +550,7 @@ public class McastService
properties.setProperty("mcastSoTimeout",
String.valueOf(mcastSoTimeout));
}
+@Override
public int getTtl() {
return mcastTTL;
}
@@ -547,6 +559,7 @@ public
svn commit: r1790983 - /tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Author: markt
Date: Tue Apr 11 14:43:35 2017
New Revision: 1790983
URL: http://svn.apache.org/viewvc?rev=1790983&view=rev
Log:
Remove unnecessary code.
request.mappingData can never be null
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1790983&r1=1790982&r2=1790983&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Tue Apr
11 14:43:35 2017
@@ -446,16 +446,14 @@ public class CoyoteAdapter implements Ad
// Log at the lowest level available. logAccess() will be
// automatically called on parent containers.
boolean logged = false;
-if (request.mappingData != null) {
-if (request.mappingData.context != null) {
-logged = true;
-request.mappingData.context.logAccess(
-request, response, time, true);
-} else if (request.mappingData.host != null) {
-logged = true;
-request.mappingData.host.logAccess(
-request, response, time, true);
-}
+if (request.mappingData.context != null) {
+logged = true;
+request.mappingData.context.logAccess(
+request, response, time, true);
+} else if (request.mappingData.host != null) {
+logged = true;
+request.mappingData.host.logAccess(
+request, response, time, true);
}
if (!logged) {
connector.getService().getContainer().logAccess(
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1790991 - in /tomcat/trunk: java/org/apache/catalina/connector/CoyoteAdapter.java webapps/docs/changelog.xml
Author: markt
Date: Tue Apr 11 15:17:27 2017
New Revision: 1790991
URL: http://svn.apache.org/viewvc?rev=1790991&view=rev
Log:
Avoid potential NullPointerExceptions related to access logging during
shutdown, some of which have been observed when running the unit tests.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1790991&r1=1790990&r2=1790991&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Tue Apr
11 15:17:27 2017
@@ -276,8 +276,9 @@ public class CoyoteAdapter implements Ad
if (req.getStartTime() != -1) {
time = System.currentTimeMillis() - req.getStartTime();
}
-if (request.getMappingData().context != null) {
-request.getMappingData().context.logAccess(request,
response, time, false);
+Context context = request.getContext();
+if (context != null) {
+context.logAccess(request, response, time, false);
} else {
log(req, res, time);
}
@@ -390,8 +391,16 @@ public class CoyoteAdapter implements Ad
if (!async && postParseSuccess) {
// Log only if processing was invoked.
// If postParseRequest() failed, it has already logged it.
-request.getMappingData().context.logAccess(request, response,
-System.currentTimeMillis() - req.getStartTime(),
false);
+Context context = request.getContext();
+// If the context is null, it is likely that the endpoint was
+// shutdown, this connection closed and the request recycled in
+// a different thread. That thread will have updated the access
+// log so it is OK not to update the access log here in that
+// case.
+if (context != null) {
+context.logAccess(request, response,
+System.currentTimeMillis() - req.getStartTime(),
false);
+}
}
req.getRequestProcessor().setWorkerThreadName(null);
@@ -446,18 +455,17 @@ public class CoyoteAdapter implements Ad
// Log at the lowest level available. logAccess() will be
// automatically called on parent containers.
boolean logged = false;
-if (request.mappingData.context != null) {
+Context context = request.mappingData.context;
+Host host = request.mappingData.host;
+if (context != null) {
logged = true;
-request.mappingData.context.logAccess(
-request, response, time, true);
-} else if (request.mappingData.host != null) {
+context.logAccess(request, response, time, true);
+} else if (host != null) {
logged = true;
-request.mappingData.host.logAccess(
-request, response, time, true);
+host.logAccess(request, response, time, true);
}
if (!logged) {
-connector.getService().getContainer().logAccess(
-request, response, time, true);
+connector.getService().getContainer().logAccess(request,
response, time, true);
}
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1790991&r1=1790990&r2=1790991&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Apr 11 15:17:27 2017
@@ -85,6 +85,11 @@
failure to load this class masking the true problem during error
handling. (markt)
+
+Avoid potential NullPointerExceptions related to access
+logging during shutdown, some of which have been observed when running
+the unit tests. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1790992 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/CoyoteAdapter.java
Author: markt Date: Tue Apr 11 15:19:25 2017 New Revision: 1790992 URL: http://svn.apache.org/viewvc?rev=1790992&view=rev Log: Remove unnecessary code. request.mappingData can never be null Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 11 15:19:25 2017 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747 924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1 756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217 2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1
svn commit: r1790993 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/CoyoteAdapter.java webapps/docs/changelog.xml
Author: markt Date: Tue Apr 11 15:19:53 2017 New Revision: 1790993 URL: http://svn.apache.org/viewvc?rev=1790993&view=rev Log: Avoid potential NullPointerExceptions related to access logging during shutdown, some of which have been observed when running the unit tests. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 11 15:19:53 2017 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747 924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1 756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217 2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763
Re: [VOTE] Release Apache Tomcat 9.0.0.M19
Am 11.04.2017 um 13:47 schrieb Mark Thomas: On 30/03/17 20:35, Rainer Jung wrote: - Exceptions: the biggest difference is more NullPointerException (about 32 new ones). They seem to happen after the stop was issued and only for apr and nio, not for nio2. Two cases: - org.apache.coyote.http11.Http11Processor.endRequest Error finishing response (20 times) I've got to the bottom of what is causing this. I'm still investigating potential solutions. What happens is: - request processing thread writes the response - main thread reads response and ends the test - ending the test stops the Tomcat instance - that eventually calls stop on the endpoint - the endpoint stops the poller - the poller times out any open connections - timing out the connection recycles the MappingData - all of this happens before the request processing thread gets as far as line 393 in the CoyoteAdapter and that triggers the NPE. Thanks for investigating and letting us know! I saw your new Null checks in CoyoteAdapter. Regards, Rainer at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:393) at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:498) at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:66) at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:796) Line 393 is: request.getMappingData().context.logAccess(request, response, System.currentTimeMillis() - req.getStartTime(), false); Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53138] Not able to download a file size of 740KB using NIO connector in tomcat version 7.0.27. But with the same configuration I was able to download that in tomcat 7.0.26.
https://bz.apache.org/bugzilla/show_bug.cgi?id=53138 Giuseppe Schiavo changed: What|Removed |Added Component|Connectors |Connectors Target Milestone|--- | Status|RESOLVED|REOPENED Version|7.0.27 |8.0.18 Product|Tomcat 7|Tomcat 8 Resolution|FIXED |--- --- Comment #14 from Giuseppe Schiavo --- This same issue is still happening on Tomcat 8. Setting the flag useSendData to false is a workaround my team has applied for now, but the bug is till there in Tomcat 8 and we would like to avoid using useSendData=false because increased CPU consumption. This issue is happening using with apache-tomcat-8.0.18 in Windows 7 environment -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53138] Not able to download a file size of 740KB using NIO connector in tomcat version 7.0.27. This issue is still happening in Tomcat 8, inconsistently, but frequently, and not depending of file
https://bz.apache.org/bugzilla/show_bug.cgi?id=53138 Giuseppe Schiavo changed: What|Removed |Added Summary|Not able to download a file |Not able to download a file |size of 740KB using NIO |size of 740KB using NIO |connector in tomcat version |connector in tomcat version |7.0.27. But with the same |7.0.27. This issue is still |configuration I was able to |happening in Tomcat 8, |download that in tomcat |inconsistently, but |7.0.26. |frequently, and not ||depending of file size. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1791027 - in /tomcat/trunk: java/org/apache/el/parser/ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/ test/javax/el/ test/org/apache/catalina/connector/ test/org/apache/ca
Author: markt
Date: Tue Apr 11 20:40:36 2017
New Revision: 1791027
URL: http://svn.apache.org/viewvc?rev=1791027&view=rev
Log:
Refactoring in preparation for Java 9. Refactor to avoid using some methods
that will be deprecated in Java 9 onwards.
Modified:
tomcat/trunk/java/org/apache/el/parser/AstFloatingPoint.java
tomcat/trunk/java/org/apache/el/parser/AstInteger.java
tomcat/trunk/java/org/apache/el/parser/AstNegative.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
tomcat/trunk/test/javax/el/TestArrayELResolver.java
tomcat/trunk/test/javax/el/TestBeanELResolver.java
tomcat/trunk/test/javax/el/TestListELResolver.java
tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/el/parser/AstFloatingPoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstFloatingPoint.java?rev=1791027&r1=1791026&r2=1791027&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstFloatingPoint.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstFloatingPoint.java Tue Apr 11
20:40:36 2017
@@ -38,7 +38,7 @@ public final class AstFloatingPoint exte
public Number getFloatingPoint() {
if (this.number == null) {
try {
-this.number = new Double(this.image);
+this.number = Double.valueOf(this.image);
} catch (ArithmeticException e0) {
this.number = new BigDecimal(this.image);
}
Modified: tomcat/trunk/java/org/apache/el/parser/AstInteger.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstInteger.java?rev=1791027&r1=1791026&r2=1791027&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstInteger.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstInteger.java Tue Apr 11 20:40:36
2017
@@ -38,7 +38,7 @@ public final class AstInteger extends Si
protected Number getInteger() {
if (this.number == null) {
try {
-this.number = new Long(this.image);
+this.number = Long.valueOf(this.image);
} catch (ArithmeticException e1) {
this.number = new BigInteger(this.image);
}
Modified: tomcat/trunk/java/org/apache/el/parser/AstNegative.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstNegative.java?rev=1791027&r1=1791026&r2=1791027&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstNegative.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstNegative.java Tue Apr 11 20:40:36
2017
@@ -56,7 +56,7 @@ public final class AstNegative extends S
}
if (obj instanceof String) {
if (isStringFloat((String) obj)) {
-return new Double(-Double.parseDouble((String) obj));
+return Double.valueOf(-Double.parseDouble((String) obj));
}
return Long.valueOf(-Long.parseLong((String) obj));
}
@@ -64,13 +64,13 @@ public final class AstNegative extends S
return Long.valueOf(-((Long) obj).longValue());
}
if (obj instanceof Double) {
-return new Double(-((Double) obj).doubleValue());
+return Double.valueOf(-((Double) obj).doubleValue());
}
if (obj instanceof Integer) {
return Integer.valueOf(-((Integer) obj).intValue());
}
if (obj instanceof Float) {
-return new Float(-((Float) obj).floatValue());
+return Float.valueOf(-((Float) obj).floatValue());
}
if (obj instanceof Short) {
return Short.valueOf((short) -((Short) obj).shortValue());
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java?rev=1791027&r1=1791026&r2=1791027&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
Tue Apr 11 20:40:36 2017
@@ -120,7 +120,7 @@ public class GenericNamingResourcesFacto
if ("java.lang.Integer".equals(paramType.getName())
|| "int".equals(paramType.getName())) {
[Bug 57830] Add support for ProxyProtocol
https://bz.apache.org/bugzilla/show_bug.cgi?id=57830 --- Comment #17 from Rob --- Would it make sense to create a new protocol object either containing or derived from Http11NioProtocol (e.g. ProxyHttp11NioProtocol)? That would avoid put the proxy protocol code in a class by itself. I have no idea if this would, work for all configurations. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1791028 - in /tomcat/trunk: java/org/apache/el/lang/ java/org/apache/jasper/compiler/ java/org/apache/tomcat/util/ test/org/apache/el/ test/org/apache/jasper/runtime/ test/webapp/WEB-INF/
Author: markt
Date: Tue Apr 11 21:16:04 2017
New Revision: 1791028
URL: http://svn.apache.org/viewvc?rev=1791028&view=rev
Log:
Refactoring in preparation for Java 9. Refactor to avoid using some methods
that will be deprecated in Java 9 onwards.
Modified:
tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java
tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
tomcat/trunk/java/org/apache/tomcat/util/Diagnostics.java
tomcat/trunk/test/org/apache/el/TestELInJsp.java
tomcat/trunk/test/org/apache/jasper/runtime/TestJspContextWrapper.java
tomcat/trunk/test/webapp/WEB-INF/tags/bug58178b.tag
tomcat/trunk/test/webapp/bug5/bug57142.jsp
Modified: tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java?rev=1791028&r1=1791027&r2=1791028&view=diff
==
--- tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java Tue Apr 11 21:16:04
2017
@@ -19,6 +19,7 @@ package org.apache.el.lang;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.math.RoundingMode;
import org.apache.el.util.MessageFactory;
@@ -53,7 +54,7 @@ public abstract class ELArithmetic {
@Override
protected Number divide(Number num0, Number num1) {
return ((BigDecimal) num0).divide((BigDecimal) num1,
-BigDecimal.ROUND_HALF_UP);
+RoundingMode.HALF_UP);
}
@Override
@@ -98,7 +99,7 @@ public abstract class ELArithmetic {
@Override
protected Number divide(Number num0, Number num1) {
-return (new BigDecimal((BigInteger) num0)).divide(new
BigDecimal((BigInteger) num1), BigDecimal.ROUND_HALF_UP);
+return (new BigDecimal((BigInteger) num0)).divide(new
BigDecimal((BigInteger) num1), RoundingMode.HALF_UP);
}
@Override
Modified: tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java?rev=1791028&r1=1791027&r2=1791028&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java Tue Apr
11 21:16:04 2017
@@ -35,7 +35,7 @@ class EncodingDetector {
private static final XMLInputFactory XML_INPUT_FACTORY;
static {
-XML_INPUT_FACTORY = XMLInputFactory.newFactory();
+XML_INPUT_FACTORY =
XMLInputFactory.newFactory("javax.xml.stream.XMLInputFactory", null);
}
private final String encoding;
Modified: tomcat/trunk/java/org/apache/tomcat/util/Diagnostics.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/Diagnostics.java?rev=1791028&r1=1791027&r2=1791028&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/Diagnostics.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/Diagnostics.java Tue Apr 11
21:16:04 2017
@@ -45,6 +45,7 @@ import java.lang.management.MemoryPoolMX
import java.lang.management.MemoryUsage;
import java.lang.management.MonitorInfo;
import java.lang.management.OperatingSystemMXBean;
+import java.lang.management.PlatformLoggingMXBean;
import java.lang.management.RuntimeMXBean;
import java.lang.management.ThreadInfo;
import java.lang.management.ThreadMXBean;
@@ -57,8 +58,6 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.logging.LogManager;
-import java.util.logging.LoggingMXBean;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -95,8 +94,8 @@ public class Diagnostics {
// XXX Not sure whether the following MBeans should better
// be retrieved on demand, i.e. whether they can change
// dynamically in the MBeanServer.
-private static final LoggingMXBean loggingMXBean =
-LogManager.getLoggingMXBean();
+private static final PlatformLoggingMXBean loggingMXBean =
+ManagementFactory.getPlatformMXBean(PlatformLoggingMXBean.class);
private static final MemoryMXBean memoryMXBean =
ManagementFactory.getMemoryMXBean();
private static final List garbageCollectorMXBeans =
Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=1791028&r1=1791027&r2=1791028&view=diff
==
--- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Tue Apr 11 21:16:04 2017
@@ -17,7 +17,7 @@
package o
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/2292 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1791028 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53138] Not able to download a file size of 740KB using NIO connector in tomcat version 7.0.27. This issue is still happening in Tomcat 8, inconsistently, but frequently, and not depending of file
https://bz.apache.org/bugzilla/show_bug.cgi?id=53138 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #15 from Mark Thomas --- This specific issue was fixed for 8.0.x almost 5 years ago. If you are seeing an issue with similar symptoms, please test with the latest 8.0.x release (8.0.43 as I type this) and if you still see the issue please create a new bug report. You'll need to provide the simplest set of steps to reproduce the issue on a clean install of the latest 8.0.x release. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1791032 - /tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
Author: markt
Date: Tue Apr 11 21:34:50 2017
New Revision: 1791032
URL: http://svn.apache.org/viewvc?rev=1791032&view=rev
Log:
Revert the Java 9 change that breaks in Java 8
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java?rev=1791032&r1=1791031&r2=1791032&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java Tue Apr
11 21:34:50 2017
@@ -35,7 +35,7 @@ class EncodingDetector {
private static final XMLInputFactory XML_INPUT_FACTORY;
static {
-XML_INPUT_FACTORY =
XMLInputFactory.newFactory("javax.xml.stream.XMLInputFactory", null);
+XML_INPUT_FACTORY = XMLInputFactory.newFactory();
}
private final String encoding;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1791036 - /tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
Author: markt
Date: Tue Apr 11 21:40:13 2017
New Revision: 1791036
URL: http://svn.apache.org/viewvc?rev=1791036&view=rev
Log:
Java 8 and Java 9 friendly alternative
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java?rev=1791036&r1=1791035&r2=1791036&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java Tue Apr
11 21:40:13 2017
@@ -35,7 +35,7 @@ class EncodingDetector {
private static final XMLInputFactory XML_INPUT_FACTORY;
static {
-XML_INPUT_FACTORY = XMLInputFactory.newFactory();
+XML_INPUT_FACTORY = XMLInputFactory.newInstance();
}
private final String encoding;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/2293 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1791032 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1791050 - in /tomcat/trunk/java: javax/el/ javax/security/auth/message/config/ javax/websocket/ javax/websocket/server/ org/apache/catalina/authenticator/jaspic/ org/apache/catalina/conne
Author: markt
Date: Tue Apr 11 22:36:01 2017
New Revision: 1791050
URL: http://svn.apache.org/viewvc?rev=1791050&view=rev
Log:
Refactoring in preparation for Java 9. Refactor to avoid using some methods
that will be deprecated in Java 9 onwards.
Modified:
tomcat/trunk/java/javax/el/ExpressionFactory.java
tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
tomcat/trunk/java/javax/websocket/ContainerProvider.java
tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/SimpleServerAuthConfig.java
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/java/org/apache/tomcat/InstanceManager.java
Modified: tomcat/trunk/java/javax/el/ExpressionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ExpressionFactory.java?rev=1791050&r1=1791049&r2=1791050&view=diff
==
--- tomcat/trunk/java/javax/el/ExpressionFactory.java (original)
+++ tomcat/trunk/java/javax/el/ExpressionFactory.java Tue Apr 11 22:36:01 2017
@@ -169,13 +169,14 @@ public abstract class ExpressionFactory
}
}
if (constructor == null) {
-result = (ExpressionFactory) clazz.newInstance();
+result = (ExpressionFactory)
clazz.getDeclaredConstructor().newInstance();
} else {
result =
(ExpressionFactory) constructor.newInstance(properties);
}
-} catch (InstantiationException | IllegalAccessException |
IllegalArgumentException e) {
+} catch (InstantiationException | IllegalAccessException |
IllegalArgumentException |
+NoSuchMethodException e) {
throw new ELException(
"Unable to create ExpressionFactory of type: " +
clazz.getName(),
e);
Modified:
tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java?rev=1791050&r1=1791049&r2=1791050&view=diff
==
--- tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
(original)
+++ tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
Tue Apr 11 22:36:01 2017
@@ -16,6 +16,7 @@
*/
package javax.security.auth.message.config;
+import java.lang.reflect.InvocationTargetException;
import java.security.AccessController;
import java.security.Permission;
import java.security.PrivilegedAction;
@@ -65,13 +66,14 @@ public abstract class AuthConfigFactory
new PrivilegedExceptionAction() {
@Override
public AuthConfigFactory run() throws ClassNotFoundException,
-InstantiationException, IllegalAccessException {
+InstantiationException, IllegalAccessException,
IllegalArgumentException,
+InvocationTargetException, NoSuchMethodException,
SecurityException {
// Load this class with the same class loader as used for
// this class. Note that the Thread context class loader
// should not be used since that would trigger a memory
leak
// in container environments.
Class clazz = Class.forName(className);
-return (AuthConfigFactory) clazz.newInstance();
+return (AuthConfigFactory)
clazz.getDeclaredConstructor().newInstance();
}
});
} catch (PrivilegedActionException e) {
Modified: tomcat/trunk/java/javax/websocket/ContainerProvider.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/ContainerProvider.java?rev=1791050&r1=1791049&r2=1791050&view=diff
==
--- tomcat/trunk/java/javax/websocket/ContainerProvider.java (original)
+++ tomcat/trunk/java/javax/websocket/ContainerProvider.java Tue Apr 11
22:36:01 2017
@@ -16,6 +16,7 @@
*/
package javax.websocket;
+import java.lang.reflect.InvocationTargetException;
import java.util.Iterator;
import java.util.ServiceLoader;
@@ -50,9 +51,10 @@ public abstract class ContainerProvider
Class clazz =
(Class) Class.forName
[GUMP@vmgump-vm3]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs] The following work was performed: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 17 mins 55 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.6-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170412-native-src.tar.gz -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170412.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170412-native-src. tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20170412/bin/openssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/worksp
[GUMP@vmgump-vm3]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio2 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio2 : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs] The following work was performed: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 16 mins 20 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.6-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170412-native-src.tar.gz -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170412.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170412-native-src .tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20170412/bin/openssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/pu
[GUMP@vmgump-vm3]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs] The following work was performed: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 17 mins 15 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Dtest.temp=output/test-tmp-APR -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dtest.accesslog=true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.6-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170412.jar -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20170412/bin/openssl -Dexecute.test.nio=false -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dexecute.test.apr=true -Dexecute.test.nio2=false -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170412-native-src.tar.gz -Dtest.reports=output/logs-APR -Dtomc at-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170412-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20170412/lib -Dtest.relaxTiming=true -Dtest.excludePerformance=true -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/w
svn commit: r1791068 - in /tomcat/trunk/java/org/apache/catalina/tribes/transport: ReceiverBase.java nio/NioReceiver.java nio/NioReceiverMBean.java
Author: kfujino
Date: Wed Apr 12 04:17:56 2017
New Revision: 1791068
URL: http://svn.apache.org/viewvc?rev=1791068&view=rev
Log:
Add MBean for Receiver component.
Added:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiverMBean.java
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java?rev=1791068&r1=1791067&r2=1791068&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
Wed Apr 12 04:17:56 2017
@@ -26,11 +26,14 @@ import java.util.concurrent.ThreadFactor
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import javax.management.ObjectName;
+
import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.ChannelReceiver;
import org.apache.catalina.tribes.MessageListener;
import org.apache.catalina.tribes.io.ListenCallback;
+import org.apache.catalina.tribes.jmx.JmxRegistry;
import org.apache.catalina.tribes.util.ExecutorFactory;
import org.apache.catalina.tribes.util.StringManager;
import org.apache.juli.logging.Log;
@@ -82,6 +85,11 @@ public abstract class ReceiverBase imple
private ExecutorService executor;
private Channel channel;
+/**
+ * the ObjectName of this Receiver.
+ */
+private ObjectName oname = null;
+
public ReceiverBase() {
}
@@ -94,12 +102,20 @@ public abstract class ReceiverBase imple
TaskThreadFactory tf = new
TaskThreadFactory("Tribes-Task-Receiver" + channelName + "-");
executor = ExecutorFactory.newThreadPool(minThreads, maxThreads,
maxIdleTime, TimeUnit.MILLISECONDS, tf);
}
+// register jmx
+JmxRegistry jmxRegistry = JmxRegistry.getRegistry(channel);
+if (jmxRegistry != null) this.oname =
jmxRegistry.registerJmx(",component=Receiver", this);
}
@Override
public void stop() {
if ( executor != null ) executor.shutdownNow();//ignore left overs
executor = null;
+if (oname != null) {
+JmxRegistry jmxRegistry = JmxRegistry.getRegistry(channel);
+if (jmxRegistry != null) jmxRegistry.unregisterJmx(oname);
+oname = null;
+}
channel = null;
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=1791068&r1=1791067&r2=1791068&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Wed Apr 12 04:17:56 2017
@@ -42,7 +42,7 @@ import org.apache.catalina.tribes.util.S
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
-public class NioReceiver extends ReceiverBase implements Runnable {
+public class NioReceiver extends ReceiverBase implements Runnable,
NioReceiverMBean {
private static final Log log = LogFactory.getLog(NioReceiver.class);
Added:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiverMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiverMBean.java?rev=1791068&view=auto
==
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiverMBean.java
(added)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiverMBean.java
Wed Apr 12 04:17:56 2017
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
