svn commit: r1703774 - /tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java
Author: markt Date: Fri Sep 18 08:51:59 2015 New Revision: 1703774 URL: http://svn.apache.org/viewvc?rev=1703774=rev Log: Clean-up. No functional change. Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java?rev=1703774=1703773=1703774=diff == --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java Fri Sep 18 08:51:59 2015 @@ -14,16 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.catalina.util; - import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleListener; - /** * Support class to assist in firing LifecycleEvent notifications to * registered LifecycleListeners. @@ -32,10 +28,8 @@ import org.apache.catalina.LifecycleList */ public final class LifecycleSupport { - // --- Constructors - /** * Construct a new LifecycleSupport object associated with the specified * Lifecycle component. @@ -44,16 +38,13 @@ public final class LifecycleSupport { * of events that we fire */ public LifecycleSupport(Lifecycle lifecycle) { - super(); this.lifecycle = lifecycle; - } // - Instance Variables - /** * The source component for lifecycle events that we will fire. */ @@ -70,14 +61,12 @@ public final class LifecycleSupport { // - Public Methods - /** * Add a lifecycle event listener to this component. * * @param listener The listener to add */ public void addLifecycleListener(LifecycleListener listener) { - synchronized (listenersLock) { LifecycleListener results[] = new LifecycleListener[listeners.length + 1]; @@ -86,7 +75,6 @@ public final class LifecycleSupport { results[listeners.length] = listener; listeners = results; } - } @@ -95,9 +83,7 @@ public final class LifecycleSupport { * Lifecycle has no listeners registered, a zero-length array is returned. */ public LifecycleListener[] findLifecycleListeners() { - return listeners; - } @@ -110,12 +96,11 @@ public final class LifecycleSupport { * @param data Event data */ public void fireLifecycleEvent(String type, Object data) { - LifecycleEvent event = new LifecycleEvent(lifecycle, type, data); LifecycleListener interested[] = listeners; -for (int i = 0; i < interested.length; i++) +for (int i = 0; i < interested.length; i++) { interested[i].lifecycleEvent(event); - +} } @@ -125,7 +110,6 @@ public final class LifecycleSupport { * @param listener The listener to remove */ public void removeLifecycleListener(LifecycleListener listener) { - synchronized (listenersLock) { int n = -1; for (int i = 0; i < listeners.length; i++) { @@ -145,8 +129,5 @@ public final class LifecycleSupport { } listeners = results; } - } - - } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58371] Data races on field org.apache.tomcat.util.buf.MessageBytes.hasStrValue & strValue
https://bz.apache.org/bugzilla/show_bug.cgi?id=58371 --- Comment #3 from Mark Thomas--- *** Bug 58399 has been marked as a duplicate of this bug. *** -- 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 58399] Data race on field org.apache.tomcat.util.buf.ByteChunk.charset
https://bz.apache.org/bugzilla/show_bug.cgi?id=58399 Mark Thomaschanged: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #1 from Mark Thomas --- *** This bug has been marked as a duplicate of bug 58371 *** -- 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: r1703784 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
Author: markt Date: Fri Sep 18 09:04:20 2015 New Revision: 1703784 URL: http://svn.apache.org/viewvc?rev=1703784=rev Log: Fix checkstyle warning Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1703784=1703783=1703784=diff == --- tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Fri Sep 18 09:04:20 2015 @@ -48,7 +48,7 @@ public class MemberImpl implements Membe * The listen host for this member */ protected volatile byte[] host; -protected volatile transient String hostname; +protected transient volatile String hostname; /** * The tcp listen port for this member */ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/305 Buildbot URL: http://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] 1703772 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 58397] Data race on field org.apache.catalina.tribes.transport.nio.PooledParallelSender.connected
https://bz.apache.org/bugzilla/show_bug.cgi?id=58397 Mark Thomaschanged: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Fixed in trunk and 8.0.x for 8.0.27 onwards. -- 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 58398] Data race on field org.apache.catalina.util.LifecycleSupport.listeners
https://bz.apache.org/bugzilla/show_bug.cgi?id=58398 Mark Thomaschanged: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas --- Fixed in trunk and 8.0.x for 8.0.27 onwards. -- 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: r1703778 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/util/LifecycleSupport.java webapps/docs/changelog.xml
Author: markt Date: Fri Sep 18 08:56:11 2015 New Revision: 1703778 URL: http://svn.apache.org/viewvc?rev=1703778=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58398 Simplify the code and fix a data race (listeners should have been volatile) Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java?rev=1703778=1703777=1703778=diff == --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java Fri Sep 18 08:56:11 2015 @@ -16,6 +16,9 @@ */ package org.apache.catalina.util; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; + import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleListener; @@ -52,11 +55,9 @@ public final class LifecycleSupport { /** - * The set of registered LifecycleListeners for event notifications. + * The list of registered LifecycleListeners for event notifications. */ -private LifecycleListener listeners[] = new LifecycleListener[0]; - -private final Object listenersLock = new Object(); // Lock object for changes to listeners +private final List listeners = new CopyOnWriteArrayList<>(); // - Public Methods @@ -67,14 +68,7 @@ public final class LifecycleSupport { * @param listener The listener to add */ public void addLifecycleListener(LifecycleListener listener) { - synchronized (listenersLock) { - LifecycleListener results[] = -new LifecycleListener[listeners.length + 1]; - for (int i = 0; i < listeners.length; i++) - results[i] = listeners[i]; - results[listeners.length] = listener; - listeners = results; - } +listeners.add(listener); } @@ -83,7 +77,7 @@ public final class LifecycleSupport { * Lifecycle has no listeners registered, a zero-length array is returned. */ public LifecycleListener[] findLifecycleListeners() { -return listeners; +return listeners.toArray(new LifecycleListener[0]); } @@ -97,9 +91,8 @@ public final class LifecycleSupport { */ public void fireLifecycleEvent(String type, Object data) { LifecycleEvent event = new LifecycleEvent(lifecycle, type, data); -LifecycleListener interested[] = listeners; -for (int i = 0; i < interested.length; i++) { -interested[i].lifecycleEvent(event); +for (LifecycleListener listener : listeners) { +listener.lifecycleEvent(event); } } @@ -110,24 +103,6 @@ public final class LifecycleSupport { * @param listener The listener to remove */ public void removeLifecycleListener(LifecycleListener listener) { -synchronized (listenersLock) { -int n = -1; -for (int i = 0; i < listeners.length; i++) { -if (listeners[i] == listener) { -n = i; -break; -} -} -if (n < 0) -return; -LifecycleListener results[] = - new LifecycleListener[listeners.length - 1]; -int j = 0; -for (int i = 0; i < listeners.length; i++) { -if (i != n) -results[j++] = listeners[i]; -} -listeners = results; -} +listeners.remove(listener); } } Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1703778=1703777=1703778=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Fri Sep 18 08:56:11 2015 @@ -104,6 +104,10 @@ 58394: Fix a rare data race in Mapper when adding or removing a host. (markt) + +58398: Fix a rare data race in LifecycleSupport. +(markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1703785 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/tribes/membership/MemberImpl.java
Author: markt Date: Fri Sep 18 09:04:59 2015 New Revision: 1703785 URL: http://svn.apache.org/viewvc?rev=1703785=rev Log: Fix checkstyle warning Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 18 09:04:59 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657 682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1 49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,168581
svn commit: r1703772 - /tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
Author: markt Date: Fri Sep 18 08:50:33 2015 New Revision: 1703772 URL: http://svn.apache.org/viewvc?rev=1703772=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58398 Simplify the code and fix a data race (listeners should have been volatile) Modified: tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java Modified: tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java?rev=1703772=1703771=1703772=diff == --- tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java Fri Sep 18 08:50:33 2015 @@ -17,6 +17,9 @@ package org.apache.catalina.util; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; + import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleException; @@ -41,11 +44,9 @@ public abstract class LifecycleBase impl /** - * The set of registered LifecycleListeners for event notifications. + * The list of registered LifecycleListeners for event notifications. */ -private LifecycleListener listeners[] = new LifecycleListener[0]; - -private final Object listenersLock = new Object(); // Lock object for changes to listeners +private final List listeners = new CopyOnWriteArrayList<>(); /** @@ -59,14 +60,7 @@ public abstract class LifecycleBase impl */ @Override public void addLifecycleListener(LifecycleListener listener) { -synchronized (listenersLock) { -LifecycleListener results[] = new LifecycleListener[listeners.length + 1]; -for (int i = 0; i < listeners.length; i++) { -results[i] = listeners[i]; -} -results[listeners.length] = listener; -listeners = results; -} +listeners.add(listener); } @@ -75,7 +69,7 @@ public abstract class LifecycleBase impl */ @Override public LifecycleListener[] findLifecycleListeners() { -return listeners; +return listeners.toArray(new LifecycleListener[0]); } @@ -84,26 +78,7 @@ public abstract class LifecycleBase impl */ @Override public void removeLifecycleListener(LifecycleListener listener) { -synchronized (listenersLock) { -int n = -1; -for (int i = 0; i < listeners.length; i++) { -if (listeners[i] == listener) { -n = i; -break; -} -} -if (n < 0) { -return; -} -LifecycleListener results[] = new LifecycleListener[listeners.length - 1]; -int j = 0; -for (int i = 0; i < listeners.length; i++) { -if (i != n) { -results[j++] = listeners[i]; -} -} -listeners = results; -} +listeners.remove(listener); } @@ -115,9 +90,8 @@ public abstract class LifecycleBase impl */ protected void fireLifecycleEvent(String type, Object data) { LifecycleEvent event = new LifecycleEvent(this, type, data); -LifecycleListener interested[] = listeners; -for (int i = 0; i < interested.length; i++) { -interested[i].lifecycleEvent(event); +for (LifecycleListener listener : listeners) { +listener.lifecycleEvent(event); } } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1703763 - in /tomcat/trunk/java/org/apache/catalina/tribes/transport: AbstractSender.java nio/PooledParallelSender.java
Author: markt Date: Fri Sep 18 08:22:11 2015 New Revision: 1703763 URL: http://svn.apache.org/viewvc?rev=1703763=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58397 Remove unnecessary duplicated connected field and fix a rare data race on close. Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/AbstractSender.java tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/AbstractSender.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/AbstractSender.java?rev=1703763=1703762=1703763=diff == --- tomcat/trunk/java/org/apache/catalina/tribes/transport/AbstractSender.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/AbstractSender.java Fri Sep 18 08:22:11 2015 @@ -24,7 +24,7 @@ import org.apache.catalina.tribes.Member public abstract class AbstractSender implements DataSender { -private boolean connected = false; +private volatile boolean connected = false; private int rxBufSize = 25188; private int txBufSize = 43800; private int udpRxBufSize = 25188; 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=1703763=1703762=1703763=diff == --- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java Fri Sep 18 08:22:11 2015 @@ -29,14 +29,11 @@ import org.apache.catalina.tribes.util.S public class PooledParallelSender extends PooledSender { protected static final StringManager sm = StringManager.getManager(PooledParallelSender.class); -protected boolean connected = true; -public PooledParallelSender() { -super(); -} - @Override public void sendMessage(Member[] destination, ChannelMessage message) throws ChannelException { -if ( !connected ) throw new ChannelException(sm.getString("pooledParallelSender.sender.disconnected")); +if (!isConnected()) { +throw new ChannelException(sm.getString("pooledParallelSender.sender.disconnected")); +} ParallelNioSender sender = (ParallelNioSender)getSender(); if (sender == null) { ChannelException cx = new ChannelException(sm.getString( @@ -54,7 +51,6 @@ public class PooledParallelSender extend throw x; } finally { returnSender(sender); -if (!connected) disconnect(); } } } @@ -69,17 +65,4 @@ public class PooledParallelSender extend throw new RuntimeException(sm.getString("pooledParallelSender.unable.open"),x); } } - -@Override -public synchronized void disconnect() { -this.connected = false; -super.disconnect(); -} - -@Override -public synchronized void connect() throws IOException { -this.connected = true; -super.connect(); -} - } \ 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
svn commit: r1703765 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/tribes/transport/AbstractSender.java java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java webapps/docs/c
Author: markt Date: Fri Sep 18 08:33:20 2015 New Revision: 1703765 URL: http://svn.apache.org/viewvc?rev=1703765=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58397 Remove unnecessary duplicated connected field and fix a rare data race on close. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/AbstractSender.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 18 08:33:20 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657 682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1 49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,168581
[Bug 58400] Data race on field org.apache.tomcat.util.net.NioEndpoint$KeyAttachment.cometNotify
https://bz.apache.org/bugzilla/show_bug.cgi?id=58400 Mark Thomaschanged: What|Removed |Added Resolution|--- |DUPLICATE Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- *** This bug has been marked as a duplicate of bug 58396 *** -- 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 58396] Data race on field org.apache.tomcat.util.net.NioEndpoint$Poller.nextExpiration
https://bz.apache.org/bugzilla/show_bug.cgi?id=58396 --- Comment #2 from Mark Thomas--- *** Bug 58400 has been marked as a duplicate of this bug. *** -- 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 58401] Potential data race inside the data array used in org.apache.catalina.tribes.io.ChannelData & org.apache.catalina.tribes.membership.MemberImpl
https://bz.apache.org/bugzilla/show_bug.cgi?id=58401 Mark Thomaschanged: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #2 from Mark Thomas --- I think these are all duplicates of a previously fixed problem. I'm going to mrk this report as such but we can always re-open it if we find RV-Predict continues to report errors in this area. *** This bug has been marked as a duplicate of bug 58395 *** -- 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 58395] Data races inside org.apache.catalina.tribes.membership.MemberImpl
https://bz.apache.org/bugzilla/show_bug.cgi?id=58395 --- Comment #2 from Mark Thomas--- *** Bug 58401 has been marked as a duplicate of this bug. *** -- 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
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/308 Buildbot URL: http://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] 1703821 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
buildbot failure in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a new failure on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/138 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1703785 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
svn commit: r1703815 - /tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
Author: markt Date: Fri Sep 18 12:04:39 2015 New Revision: 1703815 URL: http://svn.apache.org/viewvc?rev=1703815=rev Log: Rename to avoid naming overlap in StandardContext Modified: tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java Modified: tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java?rev=1703815=1703814=1703815=diff == --- tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java Fri Sep 18 12:04:39 2015 @@ -46,7 +46,7 @@ public abstract class LifecycleBase impl /** * The list of registered LifecycleListeners for event notifications. */ -private final List listeners = new CopyOnWriteArrayList<>(); +private final List lifecycleListeners = new CopyOnWriteArrayList<>(); /** @@ -60,7 +60,7 @@ public abstract class LifecycleBase impl */ @Override public void addLifecycleListener(LifecycleListener listener) { -listeners.add(listener); +lifecycleListeners.add(listener); } @@ -69,7 +69,7 @@ public abstract class LifecycleBase impl */ @Override public LifecycleListener[] findLifecycleListeners() { -return listeners.toArray(new LifecycleListener[0]); +return lifecycleListeners.toArray(new LifecycleListener[0]); } @@ -78,7 +78,7 @@ public abstract class LifecycleBase impl */ @Override public void removeLifecycleListener(LifecycleListener listener) { -listeners.remove(listener); +lifecycleListeners.remove(listener); } @@ -90,7 +90,7 @@ public abstract class LifecycleBase impl */ protected void fireLifecycleEvent(String type, Object data) { LifecycleEvent event = new LifecycleEvent(this, type, data); -for (LifecycleListener listener : listeners) { +for (LifecycleListener listener : lifecycleListeners) { listener.lifecycleEvent(event); } } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1703825 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/Tomcat.java test/org/apache/catalina/core/TestStandardContextResources.java
Author: markt Date: Fri Sep 18 12:47:26 2015 New Revision: 1703825 URL: http://svn.apache.org/viewvc?rev=1703825=rev Log: Fix test broken by fix for BZ 58373 Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardContextResources.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 18 12:47:26 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657 682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1 49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,168581
svn commit: r1703821 - in /tomcat/trunk: java/org/apache/catalina/startup/Tomcat.java test/org/apache/catalina/core/TestStandardContextResources.java
Author: markt Date: Fri Sep 18 12:41:19 2015 New Revision: 1703821 URL: http://svn.apache.org/viewvc?rev=1703821=rev Log: Fix test broken by fix for BZ 58373 Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1703821=1703820=1703821=diff == --- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Fri Sep 18 12:41:19 2015 @@ -520,6 +520,14 @@ public class Tomcat { * @see #addWebapp(String, String) */ public Context addWebapp(Host host, String contextPath, String docBase) { +return addWebapp(host, contextPath, docBase, new ContextConfig()); +} + +/** + * @see #addWebapp(String, String) + */ +public Context addWebapp(Host host, String contextPath, String docBase, ContextConfig config) { + silence(host, contextPath); Context ctx = createContext(host, contextPath); @@ -528,11 +536,10 @@ public class Tomcat { ctx.addLifecycleListener(new DefaultWebXmlListener()); ctx.setConfigFile(getWebappConfigFile(docBase, contextPath)); -ContextConfig ctxCfg = new ContextConfig(); -ctx.addLifecycleListener(ctxCfg); +ctx.addLifecycleListener(config); // prevent it from looking ( if it finds one - it'll have dup error ) -ctxCfg.setDefaultWebXml(noDefaultWebXmlPath()); +config.setDefaultWebXml(noDefaultWebXmlPath()); if (host == null) { getHost().addChild(ctx); Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java?rev=1703821=1703820=1703821=diff == --- tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java (original) +++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java Fri Sep 18 12:41:19 2015 @@ -37,9 +37,6 @@ import static org.junit.Assert.assertTru import org.junit.Test; import org.apache.catalina.Context; -import org.apache.catalina.Lifecycle; -import org.apache.catalina.LifecycleEvent; -import org.apache.catalina.LifecycleListener; import org.apache.catalina.startup.Constants; import org.apache.catalina.startup.ContextConfig; import org.apache.catalina.startup.Tomcat; @@ -131,26 +128,14 @@ public class TestStandardContextResource @Test public void testResourcesAbsoluteOrdering() throws Exception { Tomcat tomcat = getTomcatInstance(); - File appDir = new File("test/webapp-fragments"); + +AbsoluteOrderContextConfig absoluteOrderConfig = new AbsoluteOrderContextConfig(); + // app dir is relative to server home StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test", -appDir.getAbsolutePath()); -LifecycleListener[] listener = ctx.findLifecycleListeners(); -assertEquals(3,listener.length); -assertTrue(listener[1] instanceof ContextConfig); -ContextConfig config = new ContextConfig() { -@Override -protected WebXml createWebXml() { -WebXml wxml = new WebXml(); -wxml.addAbsoluteOrdering("resources"); -wxml.addAbsoluteOrdering("resources2"); -return wxml; -} -}; -// prevent it from looking ( if it finds one - it'll have dup error ) -config.setDefaultWebXml(Constants.NoDefaultWebXml); -listener[1] = config; +appDir.getAbsolutePath(), absoluteOrderConfig); + Tomcat.addServlet(ctx, "getresource", new GetResourceServlet()); ctx.addServletMapping("/getresource", "getresource"); @@ -164,29 +149,18 @@ public class TestStandardContextResource assertEquals(Arrays.asList("resources.jar", "resources2.jar"), ctx .getServletContext().getAttribute(ServletContext.ORDERED_LIBS)); -ctx.stop(); +tomcat.getHost().removeChild(ctx); +tomcat.getHost().stop(); -LifecycleListener[] listener1 = ctx.findLifecycleListeners(); -// change ordering and reload -ContextConfig config1 = new ContextConfig() { -@Override -protected WebXml createWebXml() { -WebXml wxml = new WebXml(); -wxml.addAbsoluteOrdering("resources2"); -wxml.addAbsoluteOrdering("resources"); -return wxml; -} -}; -// prevent it from looking ( if it finds one - it'll
buildbot exception in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a build exception on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/139 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1703825 Blamelist: markt BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-validate (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-validate 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-validate : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build) Work ended in a state of : Failed Elapsed: 1 min 7 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 -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.11-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/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/checkstyle/target/checkstyle-6.11-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20150918.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.5-SNAPSHOT.ja r:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20150918.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20150918.jar:/srv/gump/packages/guava/guava-18.0.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-6.11-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [checkstyle] Running Checkstyle 6.11-SNAPSHOT on 3032 files [checkstyle] /srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java:51:24: error: 'transient' modifier out of order with the JLS suggestions. BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:550: Got 1 errors and 0 warnings. Total time: 1 minute 7 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 20150918060005, vmgump.apache.org:vmgump:20150918060005 Gump E-mail Identifier (unique within run) #2. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc8.0.x-validate (in module tomcat-8.0.x) 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-tc8.0.x-validate 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-tc8.0.x-validate : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-validate.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 1 min 9 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 -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.11-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/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/checkstyle/target/checkstyle-6.11-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20150918.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.5-SNAPSHOT.ja r:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20150918.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20150918.jar:/srv/gump/packages/guava/guava-18.0.jar - Buildfile: /srv/gump/public/workspace/tomcat-8.0.x/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-8.0.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-6.11-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/res/checkstyle [checkstyle] Running Checkstyle 6.11-SNAPSHOT on 2959 files [checkstyle] /srv/gump/public/workspace/tomcat-8.0.x/java/org/apache/catalina/tribes/membership/MemberImpl.java:51:24: error: 'transient' modifier out of order with the JLS suggestions. BUILD FAILED /srv/gump/public/workspace/tomcat-8.0.x/build.xml:541: Got 1 errors and 0 warnings. Total time: 1 minute 9 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 20150918060005, vmgump.apache.org:vmgump:20150918060005 Gump E-mail Identifier (unique within run) #1. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1703866 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/websocket/WsFrameBase.java java/org/apache/tomcat/websocket/WsFrameClient.java java/org/apache/tomcat/websocket/WsSession
Hi Mark, I think these are false positives because the completion handler is only called after the IO operation completes. There is an implicit happens-before order here. I have fixed these false positives recently. That's why I didn't report them in BZ. Could you try the latest version of RV-Predict instead? Sorry for the inconvenience because RV-Predict is also in active development based on the feedback we get from testing it against other projects. Thanks, Yilong On Fri, Sep 18, 2015 at 7:14 AM,wrote: > Author: markt > Date: Fri Sep 18 14:14:18 2015 > New Revision: 1703866 > > URL: http://svn.apache.org/viewvc?rev=1703866=rev > Log: > Fix various data races reported by RV-Predict. > Mostly caused by completion handlers that execute in a new thread > > Modified: > tomcat/tc8.0.x/trunk/ (props changed) > tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java > > tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java > tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java > tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml > > Propchange: tomcat/tc8.0.x/trunk/ > > -- > --- svn:mergeinfo (original) > +++ svn:mergeinfo Fri Sep 18 14:14:18 2015 > @@ -1 +1 @@ > > -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 > > > ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657 > > > 682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1 > > >
Re: svn commit: r1703866 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/websocket/WsFrameBase.java java/org/apache/tomcat/websocket/WsFrameClient.java java/org/apache/tomcat/websocket/WsSession
Are you using the 1.7-SNAPSHOT downloaded recently? It's frequently updated. If that's the case, then it's probably a real race and I have to take a closer look. Thanks, Yilong On Fri, Sep 18, 2015 at 7:43 AM, Mark Thomaswrote: > On 18/09/2015 15:27, Yilong Li wrote: > > Hi Mark, > > > > I think these are false positives because the completion handler is only > > called after the IO operation completes. There is an implicit > > happens-before order here. I have fixed these false positives recently. > > That's why I didn't report them in BZ. Could you try the latest version > of > > RV-Predict instead? Sorry for the inconvenience because RV-Predict is > also > > in active development based on the feedback we get from testing it > against > > other projects. > > I'm using 1.7-SNAPSHOT. > > Mark > > > > > > Thanks, > > Yilong > > > > On Fri, Sep 18, 2015 at 7:14 AM, wrote: > > > >> Author: markt > >> Date: Fri Sep 18 14:14:18 2015 > >> New Revision: 1703866 > >> > >> URL: http://svn.apache.org/viewvc?rev=1703866=rev > >> Log: > >> Fix various data races reported by RV-Predict. > >> Mostly caused by completion handlers that execute in a new thread > >> > >> Modified: > >> tomcat/tc8.0.x/trunk/ (props changed) > >> > tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java > >> > >> tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java > >> tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java > >> tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml > >> > >> Propchange: tomcat/tc8.0.x/trunk/ > >> > >> > -- > >> --- svn:mergeinfo (original) > >> +++ svn:mergeinfo Fri Sep 18 14:14:18 2015 > >> @@ -1 +1 @@ > >> > >> > -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644 > 8 > 92 > >> > >> > ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1 > 6 > 57 > >> > >> > 682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,13 > 7 > ,1 > >> > >> >
Re: svn commit: r1703866 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/websocket/WsFrameBase.java java/org/apache/tomcat/websocket/WsFrameClient.java java/org/apache/tomcat/websocket/WsSession
On 18/09/2015 15:51, Yilong Li wrote: > Are you using the 1.7-SNAPSHOT downloaded recently? It's frequently > updated. If that's the case, then it's probably a real race and I have to > take a closer look. Downloaded at around 10.30 UTC today. The races looked plausible. There was an obvious ordering because of the I/O but assuming the completion handlers are using a thread pool (so a new thread is not created to handle the completion) I could believe that a field update in the 'main' thread wasn't immediately visible to the completion handler thread unless the field was volatile. Mark > > Thanks, > Yilong > > On Fri, Sep 18, 2015 at 7:43 AM, Mark Thomaswrote: > >> On 18/09/2015 15:27, Yilong Li wrote: >>> Hi Mark, >>> >>> I think these are false positives because the completion handler is only >>> called after the IO operation completes. There is an implicit >>> happens-before order here. I have fixed these false positives recently. >>> That's why I didn't report them in BZ. Could you try the latest version >> of >>> RV-Predict instead? Sorry for the inconvenience because RV-Predict is >> also >>> in active development based on the feedback we get from testing it >> against >>> other projects. >> >> I'm using 1.7-SNAPSHOT. >> >> Mark >> >> >>> >>> Thanks, >>> Yilong >>> >>> On Fri, Sep 18, 2015 at 7:14 AM, wrote: >>> Author: markt Date: Fri Sep 18 14:14:18 2015 New Revision: 1703866 URL: http://svn.apache.org/viewvc?rev=1703866=rev Log: Fix various data races reported by RV-Predict. Mostly caused by completion handlers that execute in a new thread Modified: tomcat/tc8.0.x/trunk/ (props changed) >> tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ >> -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 18 14:14:18 2015 @@ -1 +1 @@ >> -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644 >> 8 >> 92 >> ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1 >> 6 >> 57 >>
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/312 Buildbot URL: http://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] 1703865 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
Re: svn commit: r1703866 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/websocket/WsFrameBase.java java/org/apache/tomcat/websocket/WsFrameClient.java java/org/apache/tomcat/websocket/WsSession
On 18/09/2015 15:27, Yilong Li wrote: > Hi Mark, > > I think these are false positives because the completion handler is only > called after the IO operation completes. There is an implicit > happens-before order here. I have fixed these false positives recently. > That's why I didn't report them in BZ. Could you try the latest version of > RV-Predict instead? Sorry for the inconvenience because RV-Predict is also > in active development based on the feedback we get from testing it against > other projects. I'm using 1.7-SNAPSHOT. Mark > > Thanks, > Yilong > > On Fri, Sep 18, 2015 at 7:14 AM,wrote: > >> Author: markt >> Date: Fri Sep 18 14:14:18 2015 >> New Revision: 1703866 >> >> URL: http://svn.apache.org/viewvc?rev=1703866=rev >> Log: >> Fix various data races reported by RV-Predict. >> Mostly caused by completion handlers that execute in a new thread >> >> Modified: >> tomcat/tc8.0.x/trunk/ (props changed) >> tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java >> >> tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java >> tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java >> tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml >> >> Propchange: tomcat/tc8.0.x/trunk/ >> >> -- >> --- svn:mergeinfo (original) >> +++ svn:mergeinfo Fri Sep 18 14:14:18 2015 >> @@ -1 +1 @@ >> >> -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644 8 92 >> >> >> ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1 6 57 >> >> >> 682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,13 7 ,1 >> >> >>
svn commit: r1703844 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/juli/AsyncFileHandler.java webapps/docs/changelog.xml
Author: markt Date: Fri Sep 18 13:34:39 2015 New Revision: 1703844 URL: http://svn.apache.org/viewvc?rev=1703844=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58412 Ensure correct method and package names are logged. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/juli/AsyncFileHandler.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 18 13:34:39 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657 682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1 49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,168581
[Bug 58412] AsyncFileHandler logs package and method name as null.null
https://bz.apache.org/bugzilla/show_bug.cgi?id=58412 Mark Thomaschanged: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- Fixed in trunk and 8.0.x for 8.0.27 onwards. -- 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: r1703850 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/tribes/membership/MemberImpl.java
Author: markt Date: Fri Sep 18 13:42:21 2015 New Revision: 1703850 URL: http://svn.apache.org/viewvc?rev=1703850=rev Log: More thread-safety Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 18 13:42:21 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657 682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1 49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,168581
svn commit: r1703853 - /tomcat/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java
Author: markt Date: Fri Sep 18 13:48:31 2015 New Revision: 1703853 URL: http://svn.apache.org/viewvc?rev=1703853=rev Log: More thread-safety Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java?rev=1703853=1703852=1703853=diff == --- tomcat/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java Fri Sep 18 13:48:31 2015 @@ -45,7 +45,7 @@ public class ObjectReader { protected long lastAccess = System.currentTimeMillis(); protected boolean accessed = false; -private boolean cancelled; +private volatile boolean cancelled; public ObjectReader(int packetSize) { this.buffer = new XByteBuffer(packetSize, true); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/310 Buildbot URL: http://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] 1703856 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
svn commit: r1703842 - /tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java
Author: markt Date: Fri Sep 18 13:27:36 2015 New Revision: 1703842 URL: http://svn.apache.org/viewvc?rev=1703842=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58412 Ensure correct method and package names are logged. Modified: tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java Modified: tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java?rev=1703842=1703841=1703842=diff == --- tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java (original) +++ tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java Fri Sep 18 13:27:36 2015 @@ -99,6 +99,11 @@ public class AsyncFileHandler extends Fi if (!isLoggable(record)) { return; } +if (record != null) { +// fill source entries, before we hand the record over to another +// thread with another class loader +record.getSourceMethodName(); +} LogEntry entry = new LogEntry(record,this); boolean added = false; try { - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1703857 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/tribes/transport/SenderState.java
Author: markt Date: Fri Sep 18 13:52:41 2015 New Revision: 1703857 URL: http://svn.apache.org/viewvc?rev=1703857=rev Log: More thread-safety Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/SenderState.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 18 13:52:41 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657 682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1 49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,168581
svn commit: r1703862 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/tribes/membership/MemberImpl.java
Author: markt Date: Fri Sep 18 14:06:40 2015 New Revision: 1703862 URL: http://svn.apache.org/viewvc?rev=1703862=rev Log: Fix another data race Code clean-up Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 18 14:06:40 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657 682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1 49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,168581
svn commit: r1703849 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
Author: markt Date: Fri Sep 18 13:41:34 2015 New Revision: 1703849 URL: http://svn.apache.org/viewvc?rev=1703849=rev Log: More thread-safety Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1703849=1703848=1703849=diff == --- tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Fri Sep 18 13:41:34 2015 @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; import java.util.Arrays; +import java.util.concurrent.atomic.AtomicInteger; import org.apache.catalina.tribes.Member; import org.apache.catalina.tribes.io.XByteBuffer; @@ -66,7 +67,8 @@ public class MemberImpl implements Membe /** * Counter for how many broadcast messages have been sent from this member */ -protected int msgCount = 0; +protected AtomicInteger msgCount = new AtomicInteger(0); + /** * The number of milliseconds since this member was * created, is kept track of using the start time @@ -156,7 +158,7 @@ public class MemberImpl implements Membe * Increment the message count. */ protected void inc() { -msgCount++; +msgCount.incrementAndGet(); } /** @@ -458,7 +460,7 @@ public class MemberImpl implements Membe } public int getMsgCount() { -return this.msgCount; +return msgCount.get(); } /** @@ -587,7 +589,7 @@ public class MemberImpl implements Membe } public void setMsgCount(int msgCount) { -this.msgCount = msgCount; +this.msgCount.set(msgCount); } public synchronized void setPort(int port) { - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1703852 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/tribes/membership/MemberImpl.java
Author: markt Date: Fri Sep 18 13:45:39 2015 New Revision: 1703852 URL: http://svn.apache.org/viewvc?rev=1703852=rev Log: More thread-safety Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 18 13:45:39 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657 682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1 49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,168581
svn commit: r1703851 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
Author: markt Date: Fri Sep 18 13:44:41 2015 New Revision: 1703851 URL: http://svn.apache.org/viewvc?rev=1703851=rev Log: More thread-safety Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1703851=1703850=1703851=diff == --- tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Fri Sep 18 13:44:41 2015 @@ -73,7 +73,7 @@ public class MemberImpl implements Membe * The number of milliseconds since this member was * created, is kept track of using the start time */ -protected long memberAliveTime = 0; +protected volatile long memberAliveTime = 0; /** * For the local member only - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1703860 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
Author: markt Date: Fri Sep 18 14:04:34 2015 New Revision: 1703860 URL: http://svn.apache.org/viewvc?rev=1703860=rev Log: Fix another data race Code clean-up Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1703860=1703859=1703860=diff == --- tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Fri Sep 18 14:04:34 2015 @@ -200,14 +200,18 @@ public class MemberImpl implements Membe @Override public synchronized byte[] getData(boolean getalive, boolean reset) { -if ( reset ) dataPkg = null; -//look in cache first -if ( dataPkg!=null ) { -if ( getalive ) { -//you'd be surprised, but System.currentTimeMillis -//shows up on the profiler -long alive=System.currentTimeMillis()-getServiceStartTime(); -XByteBuffer.toBytes(alive, dataPkg, TRIBES_MBR_BEGIN.length+4); +if (reset) { +dataPkg = null; +} +// Look in cache first +if (dataPkg != null) { +if (getalive) { +// You'd be surprised, but System.currentTimeMillis +// shows up on the profiler +long alive = System.currentTimeMillis() - getServiceStartTime(); +byte[] result = dataPkg.clone(); +XByteBuffer.toBytes(alive, result, TRIBES_MBR_BEGIN.length + 4); +dataPkg = result; } return dataPkg; } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1703865 - in /tomcat/trunk/java/org/apache/tomcat/websocket: WsFrameBase.java WsFrameClient.java WsSession.java
Author: markt Date: Fri Sep 18 14:12:41 2015 New Revision: 1703865 URL: http://svn.apache.org/viewvc?rev=1703865=rev Log: Fix various data races reported by RV-Predict. Mostly caused by completion handlers that execute in a new thread Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java?rev=1703865=1703864=1703865=diff == --- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Fri Sep 18 14:12:41 2015 @@ -78,13 +78,13 @@ public abstract class WsFrameBase { private final byte[] mask = new byte[4]; private int maskIndex = 0; private long payloadLength = 0; -private long payloadWritten = 0; +private volatile long payloadWritten = 0; // Attributes tracking state -private State state = State.NEW_FRAME; +private volatile State state = State.NEW_FRAME; private volatile boolean open = true; -private int readPos = 0; -protected int writePos = 0; +private volatile int readPos = 0; +protected volatile int writePos = 0; public WsFrameBase(WsSession wsSession, Transformation transformation) { inputBuffer = new byte[Constants.DEFAULT_BUFFER_SIZE]; Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java?rev=1703865=1703864=1703865=diff == --- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java Fri Sep 18 14:12:41 2015 @@ -37,7 +37,7 @@ public class WsFrameClient extends WsFra private final AsyncChannelWrapper channel; private final CompletionHandlerhandler; // Not final as it may need to be re-sized -private ByteBuffer response; +private volatile ByteBuffer response; public WsFrameClient(ByteBuffer response, AsyncChannelWrapper channel, WsSession wsSession, Transformation transformation) { Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1703865=1703864=1703865=diff == --- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Fri Sep 18 14:12:41 2015 @@ -84,10 +84,10 @@ public class WsSession implements Sessio private final String id; // Expected to handle message types of only -private MessageHandler textMessageHandler = null; +private volatile MessageHandler textMessageHandler = null; // Expected to handle message types of only -private MessageHandler binaryMessageHandler = null; -private MessageHandler.Whole pongMessageHandler = null; +private volatile MessageHandler binaryMessageHandler = null; +private volatile MessageHandler.Whole pongMessageHandler = null; private volatile State state = State.OPEN; private final Object stateLock = new Object(); private final Map userProperties = new ConcurrentHashMap<>(); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/309 Buildbot URL: http://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] 1703842 Blamelist: markt BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1703854 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/tribes/io/ObjectReader.java
Author: markt Date: Fri Sep 18 13:49:05 2015 New Revision: 1703854 URL: http://svn.apache.org/viewvc?rev=1703854=rev Log: More thread-safety Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 18 13:49:05 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657 682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1 49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,168581
svn commit: r1703856 - /tomcat/trunk/java/org/apache/catalina/tribes/transport/SenderState.java
Author: markt Date: Fri Sep 18 13:52:01 2015 New Revision: 1703856 URL: http://svn.apache.org/viewvc?rev=1703856=rev Log: More thread-safety Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/SenderState.java Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/SenderState.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/SenderState.java?rev=1703856=1703855=1703856=diff == --- tomcat/trunk/java/org/apache/catalina/tribes/transport/SenderState.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/SenderState.java Fri Sep 18 13:52:01 2015 @@ -52,7 +52,7 @@ public class SenderState { // - Instance Variables -private int state = READY; +private volatile int state = READY; // - Constructor - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1703866 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/websocket/WsFrameBase.java java/org/apache/tomcat/websocket/WsFrameClient.java java/org/apache/tomcat/websocket/WsSession.jav
Author: markt Date: Fri Sep 18 14:14:18 2015 New Revision: 1703866 URL: http://svn.apache.org/viewvc?rev=1703866=rev Log: Fix various data races reported by RV-Predict. Mostly caused by completion handlers that execute in a new thread Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 18 14:14:18 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657 682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1 49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,168581
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/311 Buildbot URL: http://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] 1703860 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
New Coverity Scan
Hi, I uploaded new scan [1] (against Tomcat 8 trunk). Regards, Violeta [1] https://scan.coverity.com/projects/apache-tomcat
svn commit: r1703890 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Author: markt Date: Fri Sep 18 15:34:30 2015 New Revision: 1703890 URL: http://svn.apache.org/viewvc?rev=1703890=rev Log: Test case for bug 58414. This passes without any changes. Is there something else going on? Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1703890=1703889=1703890=diff == --- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java Fri Sep 18 15:34:30 2015 @@ -62,6 +62,7 @@ import org.apache.tomcat.websocket.serve public class TestWsWebSocketContainer extends TomcatBaseTest { +private static final String MESSAGE_EMPTY = ""; private static final String MESSAGE_STRING_1 = "qwerty"; private static final String MESSAGE_TEXT_4K; private static final byte[] MESSAGE_BINARY_4K = new byte[4096]; @@ -937,7 +938,18 @@ public class TestWsWebSocketContainer ex @Test -public void testPerMessageDefalteClient() throws Exception { +public void testPerMessageDefalteClient01() throws Exception { +doTestPerMessageDefalteClient01(MESSAGE_STRING_1); +} + + +@Test +public void testPerMessageDefalteClient02() throws Exception { +doTestPerMessageDefalteClient01(MESSAGE_EMPTY); +} + + +private void doTestPerMessageDefalteClient01(String msg) throws Exception { Tomcat tomcat = getTomcatInstance(); // No file system docBase required Context ctx = tomcat.addContext("", null); @@ -964,7 +976,7 @@ public class TestWsWebSocketContainer ex CountDownLatch latch = new CountDownLatch(1); BasicText handler = new BasicText(latch); wsSession.addMessageHandler(handler); -wsSession.getBasicRemote().sendText(MESSAGE_STRING_1); +wsSession.getBasicRemote().sendText(msg); boolean latchResult = handler.getLatch().await(10, TimeUnit.SECONDS); @@ -972,7 +984,7 @@ public class TestWsWebSocketContainer ex Queue messages = handler.getMessages(); Assert.assertEquals(1, messages.size()); -Assert.assertEquals(MESSAGE_STRING_1, messages.peek()); +Assert.assertEquals(msg, messages.peek()); ((WsWebSocketContainer) wsContainer).destroy(); } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58414] Can not transfer empty string through Web Socket
https://bz.apache.org/bugzilla/show_bug.cgi?id=58414 --- Comment #1 from Mark Thomas--- I've been able to reproduce this with some edits to the chat example that ships with Tomcat. Working on a fix now. -- 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
Re: svn commit: r1703866 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/websocket/WsFrameBase.java java/org/apache/tomcat/websocket/WsFrameClient.java java/org/apache/tomcat/websocket/WsSession
Yes, you are right. These are real. I didn't rerun the entire test suite after fixing the obvious false positives. Yilong On Fri, Sep 18, 2015 at 7:58 AM, Mark Thomaswrote: > On 18/09/2015 15:51, Yilong Li wrote: > > Are you using the 1.7-SNAPSHOT downloaded recently? It's frequently > > updated. If that's the case, then it's probably a real race and I have to > > take a closer look. > > Downloaded at around 10.30 UTC today. > > The races looked plausible. There was an obvious ordering because of the > I/O but assuming the completion handlers are using a thread pool (so a > new thread is not created to handle the completion) I could believe that > a field update in the 'main' thread wasn't immediately visible to the > completion handler thread unless the field was volatile. > > Mark > > > > > > Thanks, > > Yilong > > > > On Fri, Sep 18, 2015 at 7:43 AM, Mark Thomas wrote: > > > >> On 18/09/2015 15:27, Yilong Li wrote: > >>> Hi Mark, > >>> > >>> I think these are false positives because the completion handler is > only > >>> called after the IO operation completes. There is an implicit > >>> happens-before order here. I have fixed these false positives recently. > >>> That's why I didn't report them in BZ. Could you try the latest version > >> of > >>> RV-Predict instead? Sorry for the inconvenience because RV-Predict is > >> also > >>> in active development based on the feedback we get from testing it > >> against > >>> other projects. > >> > >> I'm using 1.7-SNAPSHOT. > >> > >> Mark > >> > >> > >>> > >>> Thanks, > >>> Yilong > >>> > >>> On Fri, Sep 18, 2015 at 7:14 AM, wrote: > >>> > Author: markt > Date: Fri Sep 18 14:14:18 2015 > New Revision: 1703866 > > URL: http://svn.apache.org/viewvc?rev=1703866=rev > Log: > Fix various data races reported by RV-Predict. > Mostly caused by completion handlers that execute in a new thread > > Modified: > tomcat/tc8.0.x/trunk/ (props changed) > > >> tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java > > > tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java > > tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java > tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml > > Propchange: tomcat/tc8.0.x/trunk/ > > > >> > -- > --- svn:mergeinfo (original) > +++ svn:mergeinfo Fri Sep 18 14:14:18 2015 > @@ -1 +1 @@ > > > >> > -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644 > > >> 8 > >> 92 > > > >> > ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1 > >> 6 > >> 57 > > > >> >
buildbot success in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a restored build on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/142 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1703862 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