svn commit: r1853115 - /tomcat/trunk/webapps/docs/config/cluster-membership.xml
Author: kfujino Date: Thu Feb 7 07:49:21 2019 New Revision: 1853115 URL: http://svn.apache.org/viewvc?rev=1853115=rev Log: Add document for r1853051. Modified: tomcat/trunk/webapps/docs/config/cluster-membership.xml Modified: tomcat/trunk/webapps/docs/config/cluster-membership.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-membership.xml?rev=1853115=1853114=1853115=diff == --- tomcat/trunk/webapps/docs/config/cluster-membership.xml (original) +++ tomcat/trunk/webapps/docs/config/cluster-membership.xml Thu Feb 7 07:49:21 2019 @@ -231,6 +231,9 @@ LocalMember: Static member that is the local member of the static cluster group. +Note: In Tomcat 9.0.17 and later, The setting of local member is not required. +It is possible to set up a list of all cluster members including local member instead of setting this components. + Only one implementation available:org.apache.catalina.tribes.membership.StaticMember @@ -296,6 +299,31 @@ + + +Before Tomcat 9.0.16 + + + Tomcat9.0.17 and later + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1853095 - /tomcat/trunk/webapps/docs/config/listeners.xml
Author: remm Date: Wed Feb 6 20:16:04 2019 New Revision: 1853095 URL: http://svn.apache.org/viewvc?rev=1853095=rev Log: Add some docs on the attributes added in the JMX remote listener. Modified: tomcat/trunk/webapps/docs/config/listeners.xml Modified: tomcat/trunk/webapps/docs/config/listeners.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/listeners.xml?rev=1853095=1853094=1853095=diff == --- tomcat/trunk/webapps/docs/config/listeners.xml (original) +++ tomcat/trunk/webapps/docs/config/listeners.xml Wed Feb 6 20:16:04 2019 @@ -508,7 +508,7 @@ The JMX Remote Lifecycle Listener fixes the ports used by the JMX/RMI Server making things much simpler if you need to connect -jconsole or a similar tool to a remote Tomcat instance that is running +visualvm or a similar tool to a remote Tomcat instance that is running behind a firewall. Note: The SSL configuration can be done with attributes identical to those @@ -516,10 +516,13 @@ properties of the default certificate as defined for SSLHostConfigCertificate. This will create a JSSE SSLContext which will be given to the JMX/RMI registry -when creating the server socket. - -The remainder of the configuration is via the standard system properties for -configuring JMX. For further information on configuring JMX see +when creating the server socket. OpenSSL specific attributes cannot +be used in the configuration as JMX remote can only use a regular +SSLContext. + +The remainder of the configuration can be done via the standard system +properties for configuring JMX. For further information on configuring JMX +see http://docs.oracle.com/javase/6/docs/technotes/guides/management/agent.html;> Monitoring and Management Using JMX included with the Java SDK documentation. @@ -532,6 +535,35 @@ + +Defines the access file used. The attribute will be set to the +value of the com.sun.management.jmxremote.access.file +system property if it is defined. + + + +Defines if authentication is used. Defaults to +true. The attribute will be set to the value of the +com.sun.management.jmxremote.authenticate system property +if it is defined. + + + +Defines the login module used. The attribute will be set to the +value of the com.sun.management.jmxremote.login.config +system property if it is defined. + + + +Defines the password file used. The attribute will be set to the +value of the com.sun.management.jmxremote.password.file +system property if it is defined. + + + +The address of the interface to be used by JMX/RMI server. + + The port to be used by the JMX/RMI registry for the Platform MBeans. This replaces the use of the @@ -539,12 +571,22 @@ should not be set when using this listener. + +Defines if the RMI registry will use SSL. Defaults to +true. The attribute will be set to the value of the +com.sun.management.jmxremote.registry.ssl system property +if it is defined. + + The port to be used by the Platform JMX/RMI server. - -The address of the interface to be used by JMX/RMI server. + +Defines if the JMX remote server will use SSL. Defaults to +true. The attribute will be set to the value of the +com.sun.management.jmxremote.ssl system property +if it is defined. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Jakarta EE - Servlet TCK (nightly)
All, I've started looking at the Jakarta EE Servlet TCK. Again a nightly build so usual caveats apply. Progress is being tracked here: https://cwiki.apache.org/confluence/display/TOMCAT/Servlet+TCK I know that we'll need a client cert for the TCK user created. I plan to do this from the same test CA we use for the unit tests. That is still TODO. The Servlet TCK has grown quite a bit since I last saw it. I've started running the tests and I already see a handful of failures so I am going to dig into those and see what I find. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Jakarta EE - WebSocket TCK (nightly)
Latest status is on the wiki: https://cwiki.apache.org/confluence/display/TOMCAT/WebSocket+TCK The timeout tests are failing again. They fail on a full run but not when run individually. I want to look into this some more but it is lower priority at the moment. Mark On 05/02/2019 14:08, Mark Thomas wrote: > On 04/02/2019 16:09, Rémy Maucherat wrote: >> On Fri, Feb 1, 2019 at 5:14 PM Rémy Maucherat wrote: >> >>> On Fri, Feb 1, 2019 at 4:50 PM Mark Thomas wrote: > > > >>> Will have to look at it again then. >>> >> >> Ok, I think I was completely ignoring the Tomcat client back then, instead >> using Tyrus, to avoid mixing client and server issues together. So after >> investigating, it looks like a race condition on the session being in the >> process of being closed and a message being received by the client >> concurrently. I put a proposal in the wiki (all tests pass with it). > > I think the root cause is different. With the configured system > properties timeouts are checked every ~10 seconds. The tests expect a > timeout to occur between 4 & 8 seconds. There is a ~40% chance of the > test passing during a run which explains the intermittent nature. > > I've updated the wiki with the necessary configuration. > > There are a couple of things these tests have highlighted that I think > are worthy of more discussion. I'll start new threads for those. > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Proposed change to STREAMS_DROP_EMPTY_MESSAGES system property
I went for c in the end. The TCK passes as do all of our own tests.
Back-porting the change is still on my personal TODO list.
Mark
On 05/02/2019 22:02, Romain Manni-Bucau wrote:
> As an user c sounds ok. Worse case maybe keep it for 1 release with some
> comm to have time to migrate if relevant.
>
> Le mar. 5 févr. 2019 à 20:10, Rémy Maucherat a écrit :
>
>> On Tue, Feb 5, 2019 at 7:58 PM Mark Thomas wrote:
>>
>>> Hi,
>>>
>>> org.apache.tomcat.websocket.STREAMS_DROP_EMPTY_MESSAGES
>>>
>>> The above system property was added to address an issue with Tomcat's
>>> WebSocket implementation not passing the TCK. Tomcat was sending empty
>>> messages when the TCK wasn't expecting a message to be sent.
>>>
>>> Now that we have access to the TCK I have been able to track down the
>>> root cause of these failures.
>>>
>>> The root cause is this code in WsRemoteEndpointImplBase:
>>> ...
>>> } else if (encoder instanceof Encoder.TextStream) {
>>> try (Writer w = getSendWriter()) {
>>> ((Encoder.TextStream) encoder).encode(obj, w);
>>> }
>>> }
>>>
>>> The call to getSendWriter() triggers the state change that a write has
>>> started. Then the exception is thrown and because of the
>>> try-with-resources close() is called. That triggers the end of message
>>> state change hence a zero length message is written.
>>>
>>> The STREAMS_DROP_EMPTY_MESSAGES causes all empty messages (not just in
>>> this error case) to be dropped.
>>>
>>> I'm currently thinking that handling of this error case and
>>> STREAMS_DROP_EMPTY_MESSAGES should be decoupled. The idea is that, in
>>> the above case, obtaining the Writer is delayed until the encoder tries
>>> to write bytes.
>>>
>>> If the above change is implemented then what should be happen to
>>> STREAMS_DROP_EMPTY_MESSAGES?
>>> a) keep it as is
>>> b) deprecate it and remove it in 10.x
>>> c) remove it now
>>>
>>> I'm leaning towards b)
>>>
>>
>> You could probably do c) as the only purpose was to stick to the TCK
>> behavior. When there is no spec, the TCK is supposed to be the referee (and
>> I don't really see why empty messages are useful).
>>
>> Rémy
>>
>>
>>>
>>> Thoughts?
>>>
>>> Mark
>>>
>>> -
>>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>>
>>>
>>
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1853072 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
Author: rjung Date: Wed Feb 6 12:53:42 2019 New Revision: 1853072 URL: http://svn.apache.org/viewvc?rev=1853072=rev Log: Make cipher test error message a bit more explicit. Backport of r1853065 from trunk. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 6 12:53:42 2019 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,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,1747 404,1747506,1747536,1747924,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-1 756289,1756408-1756410,1756778,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-176205
svn commit: r1853065 - /tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
Author: rjung
Date: Wed Feb 6 12:03:57 2019
New Revision: 1853065
URL: http://svn.apache.org/viewvc?rev=1853065=rev
Log:
Make cipher test error message a bit more explicit.
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java?rev=1853065=1853064=1853065=diff
==
---
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
Wed Feb 6 12:03:57 2019
@@ -90,7 +90,7 @@ public class TestCipher {
Set unavailableCipherSuites = new HashSet<>();
unavailableCipherSuites.addAll(expectedCipherSuites);
unavailableCipherSuites.removeAll(availableCipherSuites);
-StringBuilder unavailableList = new StringBuilder();
+StringBuilder unavailableList = new StringBuilder("Unavailable cipher
suites: ");
for (String cipher : unavailableCipherSuites) {
unavailableList.append(cipher);
unavailableList.append(' ');
@@ -100,7 +100,7 @@ public class TestCipher {
Set unexpectedCipherSuites = new HashSet<>();
unexpectedCipherSuites.addAll(availableCipherSuites);
unexpectedCipherSuites.removeAll(expectedCipherSuites);
-StringBuilder unexpectedList = new StringBuilder();
+StringBuilder unexpectedList = new StringBuilder("Unexpected cipher
suites: ");
for (String cipher : unexpectedCipherSuites) {
unexpectedList.append(cipher);
unexpectedList.append(' ');
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63075] loss of connection with mod_jk
https://bz.apache.org/bugzilla/show_bug.cgi?id=63075 Rainer Jung changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #1 from Rainer Jung --- First: I will close this ticket after my response, because your logs do not show any obvious indication for a bug. If you want to discuss this further, please first present your case to the users list: http://tomcat.apache.org/lists.html#tomcat-users The requests with status 401 in your logs seem normal. If you eg. use basic auth, then the first request does not contain credentials and responds with 401. This triggers a popup in the browser asking for credentials and the retries the same request, in your case with the user name wcadmin. These requests sometimes for (status 200) and sometimes do not work (status 503). You mod_jk logs indicate, that when they do not work, Apache can not connect to your tomcat, maybe because it is down. Note that you are also getting mod_jk errors during startup because of not having a correct JkShmFile. You should fix these before investigating your other problems further. Regards, Rainer -- 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 63075] loss of connection with mod_jk
https://bz.apache.org/bugzilla/show_bug.cgi?id=63075 rajendra rathore changed: What|Removed |Added Severity|critical|blocker Priority|P2 |P1 -- 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: r1853064 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java
Author: markt
Date: Wed Feb 6 11:20:14 2019
New Revision: 1853064
URL: http://svn.apache.org/viewvc?rev=1853064=rev
Log:
Fix IDE auto-boxing warning
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java?rev=1853064=1853063=1853064=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java
Wed Feb 6 11:20:14 2019
@@ -237,7 +237,7 @@ public class StaticMembershipService ext
// find local member from static members
for (StaticMember staticMember : this.staticMembers) {
if (Arrays.equals(InetAddress.getByName(listenHost).getAddress(),
staticMember.getHost())
-&& Integer.valueOf(listenPort) == staticMember.getPort()) {
+&& Integer.parseInt(listenPort) == staticMember.getPort())
{
this.localMember = staticMember;
break;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1853062 - in /tomcat/trunk: java/org/apache/tomcat/websocket/Constants.java java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java webapps/docs/changelog.xml webapps/docs/config/s
Author: markt
Date: Wed Feb 6 11:17:41 2019
New Revision: 1853062
URL: http://svn.apache.org/viewvc?rev=1853062=rev
Log:
Implement an alternative solution to four failing TCK test and (yah!) remove a
system property.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/systemprops.xml
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java?rev=1853062=1853061=1853062=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java Wed Feb 6
11:17:41 2019
@@ -133,10 +133,6 @@ public class Constants {
static final boolean ALLOW_UNSUPPORTED_EXTENSIONS =
Boolean.getBoolean("org.apache.tomcat.websocket.ALLOW_UNSUPPORTED_EXTENSIONS");
-// Configuration for stream behavior
-static final boolean STREAMS_DROP_EMPTY_MESSAGES =
-
Boolean.getBoolean("org.apache.tomcat.websocket.STREAMS_DROP_EMPTY_MESSAGES");
-
public static final boolean STRICT_SPEC_COMPLIANCE =
Boolean.getBoolean("org.apache.tomcat.websocket.STRICT_SPEC_COMPLIANCE");
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1853062=1853061=1853062=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Wed Feb 6 11:17:41 2019
@@ -983,15 +983,17 @@ public abstract class WsRemoteEndpointIm
throw new IllegalStateException(
sm.getString("wsRemoteEndpoint.closedOutputStream"));
}
-if (len == 0) {
-return;
-}
if ((off < 0) || (off > b.length) || (len < 0) ||
((off + len) > b.length) || ((off + len) < 0)) {
throw new IndexOutOfBoundsException();
}
used = true;
+
+if (len == 0) {
+return;
+}
+
if (buffer.remaining() == 0) {
flush();
}
@@ -1016,7 +1018,7 @@ public abstract class WsRemoteEndpointIm
// Optimisation. If there is no data to flush then do not send an
// empty message.
-if (!Constants.STREAMS_DROP_EMPTY_MESSAGES || buffer.position() >
0) {
+if (buffer.position() > 0) {
doWrite(false);
}
}
@@ -1034,7 +1036,7 @@ public abstract class WsRemoteEndpointIm
}
private void doWrite(boolean last) throws IOException {
-if (!Constants.STREAMS_DROP_EMPTY_MESSAGES || used) {
+if (used) {
buffer.flip();
endpoint.sendMessageBlock(Constants.OPCODE_BINARY, buffer,
last);
}
@@ -1062,15 +1064,17 @@ public abstract class WsRemoteEndpointIm
throw new IllegalStateException(
sm.getString("wsRemoteEndpoint.closedWriter"));
}
-if (len == 0) {
-return;
-}
if ((off < 0) || (off > cbuf.length) || (len < 0) ||
((off + len) > cbuf.length) || ((off + len) < 0)) {
throw new IndexOutOfBoundsException();
}
used = true;
+
+if (len == 0) {
+return;
+}
+
if (buffer.remaining() == 0) {
flush();
}
@@ -1093,7 +1097,7 @@ public abstract class WsRemoteEndpointIm
sm.getString("wsRemoteEndpoint.closedWriter"));
}
-if (!Constants.STREAMS_DROP_EMPTY_MESSAGES || buffer.position() >
0) {
+if (buffer.position() > 0) {
doWrite(false);
}
}
@@ -,7 +1115,7 @@ public abstract class WsRemoteEndpointIm
}
private void doWrite(boolean last) throws IOException {
-if (!Constants.STREAMS_DROP_EMPTY_MESSAGES || used) {
+if (used) {
buffer.flip();
endpoint.sendMessageBlock(buffer, last);
buffer.clear();
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1853062=1853061=1853062=diff
==
---
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/4026 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] 1853053 Blamelist: kfujino 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: r1853053 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java
Author: kfujino
Date: Wed Feb 6 08:31:30 2019
New Revision: 1853053
URL: http://svn.apache.org/viewvc?rev=1853053=rev
Log:
ws
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java?rev=1853053=1853052=1853053=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java
Wed Feb 6 08:31:30 2019
@@ -242,7 +242,7 @@ public class StaticMembershipService ext
break;
}
}
-if (this.localMember == null) throw new
IllegalStateException(sm.getString("staticMembershipService.noLocalMember"));
+if (this.localMember == null) throw new
IllegalStateException(sm.getString("staticMembershipService.noLocalMember"));
staticMembers.remove(this.localMember);
}
}
\ No newline at end of file
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
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/4025 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] 1853051 Blamelist: kfujino 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
