Re: svn commit: r1605890 - in /tomcat/trunk/java/org/apache/tomcat/websocket: LocalStrings.properties TransformationFactory.java

[Martin Grigorov]

Hi Mark,


On Thu, Jun 26, 2014 at 10:44 PM,  wrote:

> Author: markt
> Date: Thu Jun 26 19:44:54 2014
> New Revision: 1605890
>
> URL: http://svn.apache.org/r1605890
> Log:
> Fix an i18n TODO
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
>
> tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1605890&r1=1605889&r2=1605890&view=diff
>
> ==
> --- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
> (original)
> +++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
> Thu Jun 26 19:44:54 2014
> @@ -33,6 +33,8 @@ perMessageDeflate.duplicateParameter=Dup
>  perMessageDeflate.invalidWindowSize=An invalid windows of [{1}] size was
> specified for [{0}]. Valid values are whole numbers from 8 to 15 inclusive.
>  perMessageDeflate.unknownParameter=An unknown extension parameter [{0}]
> was defined
>
> +transformerFactory.unsupportedExtension=The extension [{0}] is not
> supported
> +
>  util.notToken=An illegal extension parameter was specified with name
> [{0}] and value [{1}]
>  util.invalidMessageHandler=The message handler provided does not have an
> onMessage(Object) method
>  util.invalidType=Unable to coerce value [{0}] to type [{1}]. That type is
> not supported.
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java?rev=1605890&r1=1605889&r2=1605890&view=diff
>
> ==
> ---
> tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
> (original)
> +++
> tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
> Thu Jun 26 19:44:54 2014
> @@ -20,8 +20,12 @@ import java.util.List;
>
>  import javax.websocket.Extension;
>
> +import org.apache.tomcat.util.res.StringManager;
> +
>  public class TransformationFactory {
>
> +private static final StringManager sm =
> StringManager.getManager(Constants.PACKAGE_NAME);
> +
>  private static final TransformationFactory factory = new
> TransformationFactory();
>
>  private TransformationFactory() {
> @@ -36,7 +40,6 @@ public class TransformationFactory {
>  if (PerMessageDeflate.NAME.equals(name)) {
>  return PerMessageDeflate.negotiate(preferences);
>  }
> -// TODO i18n
> -throw new IllegalArgumentException("Unsupported extension");
> +throw new
> IllegalArgumentException(sm.getString("transformerFactory.unsupportedExtension"));
>

[{0}] in
+transformerFactory.unsupportedExtension=The extension [{0}] is not
supported

suggests that there will be a replacement of the extension's name but I see
no String.format() or something similar in

+throw new
IllegalArgumentException(sm.getString("transformerFactory.unsupportedExtension"));

 }
>  }
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Early Access builds for JDK 9 b19, JDK 8u20 b20 are available on java.net

[Rory O'Donnell Oracle, Dublin Ireland]

Hi Mladen,

Early Access builds for JDK 9 b19   and 
JDK 8u20 b20   are available on 
java.net.


As we enter the later phases of development for JDK 8u20 , please log 
any show

stoppers as soon as possible.

Rgds, Rory

--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland

Re: svn commit: r1605890 - in /tomcat/trunk/java/org/apache/tomcat/websocket: LocalStrings.properties TransformationFactory.java

[Mark Thomas]

On 27/06/2014 08:09, Martin Grigorov wrote:
> Hi Mark,
> 
> 
> On Thu, Jun 26, 2014 at 10:44 PM,  wrote:
> 
>> Author: markt
>> Date: Thu Jun 26 19:44:54 2014
>> New Revision: 1605890
>>
>> URL: http://svn.apache.org/r1605890
>> Log:
>> Fix an i18n TODO
>>
>> Modified:
>> tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
>>
>> tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
>>
>> Modified:
>> tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
>> URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1605890&r1=1605889&r2=1605890&view=diff
>>
>> ==
>> --- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
>> (original)
>> +++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
>> Thu Jun 26 19:44:54 2014
>> @@ -33,6 +33,8 @@ perMessageDeflate.duplicateParameter=Dup
>>  perMessageDeflate.invalidWindowSize=An invalid windows of [{1}] size was
>> specified for [{0}]. Valid values are whole numbers from 8 to 15 inclusive.
>>  perMessageDeflate.unknownParameter=An unknown extension parameter [{0}]
>> was defined
>>
>> +transformerFactory.unsupportedExtension=The extension [{0}] is not
>> supported
>> +
>>  util.notToken=An illegal extension parameter was specified with name
>> [{0}] and value [{1}]
>>  util.invalidMessageHandler=The message handler provided does not have an
>> onMessage(Object) method
>>  util.invalidType=Unable to coerce value [{0}] to type [{1}]. That type is
>> not supported.
>>
>> Modified:
>> tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java?rev=1605890&r1=1605889&r2=1605890&view=diff
>>
>> ==
>> ---
>> tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
>> (original)
>> +++
>> tomcat/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java
>> Thu Jun 26 19:44:54 2014
>> @@ -20,8 +20,12 @@ import java.util.List;
>>
>>  import javax.websocket.Extension;
>>
>> +import org.apache.tomcat.util.res.StringManager;
>> +
>>  public class TransformationFactory {
>>
>> +private static final StringManager sm =
>> StringManager.getManager(Constants.PACKAGE_NAME);
>> +
>>  private static final TransformationFactory factory = new
>> TransformationFactory();
>>
>>  private TransformationFactory() {
>> @@ -36,7 +40,6 @@ public class TransformationFactory {
>>  if (PerMessageDeflate.NAME.equals(name)) {
>>  return PerMessageDeflate.negotiate(preferences);
>>  }
>> -// TODO i18n
>> -throw new IllegalArgumentException("Unsupported extension");
>> +throw new
>> IllegalArgumentException(sm.getString("transformerFactory.unsupportedExtension"));
>>
> 
> [{0}] in
> +transformerFactory.unsupportedExtension=The extension [{0}] is not
> supported
> 
> suggests that there will be a replacement of the extension's name but I see
> no String.format() or something similar in
> 
> +throw new
> IllegalArgumentException(sm.getString("transformerFactory.unsupportedExtension"));
> 
>  }

Look at the commit that followed a few seconds later.

Mark

>>  }
>>
>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>>
> 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1606072 - /tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java

[markt]

Author: markt
Date: Fri Jun 27 12:51:19 2014
New Revision: 1606072

URL: http://svn.apache.org/r1606072
Log:
Correct comment

Modified:

tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java?rev=1606072&r1=1606071&r2=1606072&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java 
Fri Jun 27 12:51:19 2014
@@ -50,7 +50,7 @@ public abstract class PojoMessageHandler
 int indexSession, long maxMessageSize) {
 this.pojo = pojo;
 this.method = method;
-// TODO: The method should already accessible here but the following
+// TODO: The method should already be accessible here but the following
 // code seems to be necessary in some as yet not fully understood 
cases.
 try {
 this.method.setAccessible(true);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1606103 - in /tomcat/trunk/java/org/apache/tomcat/websocket: ./ server/

[markt]

Author: markt
Date: Fri Jun 27 14:07:41 2014
New Revision: 1606103

URL: http://svn.apache.org/r1606103
Log:
Plumbing to enable transformation / extension processing for outgoing server 
messages.

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
tomcat/trunk/java/org/apache/tomcat/websocket/Transformation.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java

tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java

tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java?rev=1606103&r1=1606102&r2=1606103&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java Fri 
Jun 27 14:07:41 2014
@@ -283,4 +283,15 @@ public class PerMessageDeflate implement
 return next.validateRsvBits(i | RSV_BITMASK);
 }
 }
+
+
+@Override
+public List sendMessagePart(List messageParts) {
+// TODO: Implement compression of sent messages
+if (next == null) {
+return messageParts;
+} else {
+return next.sendMessagePart(messageParts);
+}
+}
 }

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/Transformation.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Transformation.java?rev=1606103&r1=1606102&r2=1606103&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/Transformation.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Transformation.java Fri Jun 
27 14:07:41 2014
@@ -18,18 +18,44 @@ package org.apache.tomcat.websocket;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.util.List;
 
 import javax.websocket.Extension;
 
 /**
  * The internal representation of the transformation that a WebSocket extension
  * performs on a message.
- *
- * TODO Add support for transformation of outgoing data as well as incoming.
  */
 public interface Transformation {
 
 /**
+ * Sets the next transformation in the pipeline.
+ */
+void setNext(Transformation t);
+
+/**
+ * Validate that the RSV bit(s) required by this transformation are not
+ * being used by another extension. The implementation is expected to set
+ * any bits it requires before passing the set of in-use bits to the next
+ * transformation.
+ *
+ * @param i The RSV bits marked as in use so far as an int in the
+ *  range zero to seven with RSV1 as the MSB and RSV3 as 
the
+ *  LSB
+ *
+ * @return true if the combination of RSV bits used by the
+ * transformations in the pipeline do not conflict otherwise
+ * false
+ */
+boolean validateRsvBits(int i);
+
+/**
+ * Obtain the extension that describes the information to be returned to 
the
+ * client.
+ */
+Extension getExtensionResponse();
+
+/**
  * Obtain more input data.
  *
  * @param opCodeThe opcode for the frame currently being processed
@@ -56,29 +82,16 @@ public interface Transformation {
 boolean validateRsv(int rsv, byte opCode);
 
 /**
- * Obtain the extension that describes the information to be returned to 
the
- * client.
- */
-Extension getExtensionResponse();
-
-/**
- * Sets the next transformation in the pipeline.
- */
-void setNext(Transformation t);
-
-/**
- * Validate that the RSV bit(s) required by this transformation are not
- * being used by another extension. The implementation is expected to set
- * any bits it requires before passing the set of in-use bits to the next
- * transformation.
+ * Takes the provided list of messages, transforms them, passes the
+ * transformed list on to the next transformation (if any) and then returns
+ * the resulting list of message parts after all of the transformations 
have
+ * been applied.
  *
- * @param i The RSV bits marked as in use so far as an int in the
- *  range zero to seven with RSV1 as the MSB and RSV3 as 
the
- *  LSB
+ * @param messageParts  The list of messages to be transformed
  *
- * @return true if the combination of RS

Re: Time for 7.0.55

[Mark Thomas]

On 23/06/2014 14:00, Violeta Georgieva wrote:
> 2014-06-22 21:33 GMT+03:00 Konstantin Kolinko :
>>
>> 2014-06-20 23:59 GMT+04:00 Violeta Georgieva :
>>> Hi,
>>>
>>> I would like to start preparing Tomcat 7.0.55 for voting this weekend.
>>> If you want to include something in addition to this release, reply
> here.
>>>
>>
>> Hi!
>>
>> The Mapper issues are taking longer than I anticipated, and I expect
>> myself to be busy on the start of next week.  It is impeded by
>> implementation differences (Tomcat 7 has two mappers: in Connector and
>> in Context, Tomcat 8 has one).
>>
>> I would like to backport fixes for 56653 and 56658 to Tomcat 7  (the
>> latter has not been fixed in trunk yet) along with other improvements.
>>
>> I expect that fixing those issues requires changing internal classes
>> of Mapper like I did in r1604319.  I think that we are OK with such
>> change, as those are our internal APIs.
>>
>>
>> The Tomcat-Native binaries for Windows are linked to an old version of
>> OpenSSL that has known security issues.  Christopher has not yet
>> succeeded in building it.
> 
> Ok I'll wait for you and Chris.
> Meanwhile the new JDT compiler will be officially released (Luna release -
> 25.06) and we may include it in 7.0.55.

I know we are still waiting for the fixed Windows binaries. What is the
status of the remaining work?

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 43925] org.apache.jasper.runtime.BodyContentImpl causing huge memory allocations

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=43925

--- Comment #12 from Issa Gorissen  ---
Brian, I've taken a look into the code you've submitted but I failed to
understand how this code reduce the number of array copies in comparison with
Tomcat's current implementation. I've ran the test cases with different values
for the iteration and can't see real improvements.

Calls to write(String) [1] will always induce a array copy, unfortunately,
because they are immutable.

Calls to write(char[]) [2] are not improvable because we don't know if the
caller will reuse the char array - so we need to copy it.

I don't know if calls to [1] are more frequent in a web app than calls to [2].
If it is the case, then trying to avoid the array copy from the String would be
good overall. In fact, having to manage both char[] and Strings makes it harder
to improve the whole class!



So as it seems that reducing the number of array copies is difficult while
calling write() (even doable ?), maybe improving the way the buffer grows is
the way to go - reducing the number of array copies and garbage creation.

Any comment on my reflections ?

-- 
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: r1606114 - in /tomcat/trunk: build.xml webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Fri Jun 27 15:01:55 2014
New Revision: 1606114

URL: http://svn.apache.org/r1606114
Log:
When Eclipse Compiler JAR is updated, make sure to delete its old version from 
the build/lib directory.

Modified:
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1606114&r1=1606113&r2=1606114&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Jun 27 15:01:55 2014
@@ -1044,10 +1044,19 @@
   
 
 
+
+
+
+
+  
+
+
+  
+
+
+
 
 
-
-
   
 
   

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1606114&r1=1606113&r2=1606114&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jun 27 15:01:55 2014
@@ -125,6 +125,11 @@
 Update the API stability section of the release notes now that Tomcat 8
 has had its first stable release. (markt)
   
+  
+Improve build.xml so that when Eclipse JDT Compiler is
+updated, it will delete the old JAR from build/lib
+directory. (kkolinko)
+  
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1606128 - in /tomcat/trunk: BUILDING.txt build.xml webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Fri Jun 27 15:32:32 2014
New Revision: 1606128

URL: http://svn.apache.org/r1606128
Log:
Simplify "setproxy" target.

The "proxy.use" flag can now be "on", "yes" or "true", so document "true" as 
the recommended value.
The property expansion feature for if/unless attributes is since Ant 1.8.0.

Modified:
tomcat/trunk/BUILDING.txt
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/BUILDING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1606128&r1=1606127&r2=1606128&view=diff
==
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Fri Jun 27 15:32:32 2014
@@ -144,7 +144,7 @@ ${tomcat.source}.
   The following properties should be added to the 
${tomcat.source}/build.properties
   file.
 
-proxy.use=on
+proxy.use=true
 proxy.host=proxy.domain
 proxy.port=8080
 proxy.user=username

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1606128&r1=1606127&r2=1606128&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Jun 27 15:32:32 2014
@@ -2758,14 +2758,7 @@ Apache Tomcat ${version} native binaries
 
   
 
-  
-
-
-  
-
-  
-
-  
+  
 
 
   
 
-  
+  
 
 
 
@@ -2805,7 +2798,7 @@ Apache Tomcat ${version} native binaries
 
   
 
-  
+  
 
 
 
@@ -2829,7 +2822,7 @@ Apache Tomcat ${version} native binaries
 
   
 
-  
+  
 
 
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1606128&r1=1606127&r2=1606128&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jun 27 15:32:32 2014
@@ -130,6 +130,10 @@
 updated, it will delete the old JAR from build/lib
 directory. (kkolinko)
   
+  
+Simplify implementation of "setproxy" target in build.xml.
+(kkolinko)
+  
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1606135 - in /tomcat/trunk: java/org/apache/catalina/connector/Request.java webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Fri Jun 27 15:50:05 2014
New Revision: 1606135

URL: http://svn.apache.org/r1606135
Log:
Followup to r1604472 for better compatibility.
Reintroduce setter methods removed by r1604472 and mark them deprecated.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1606135&r1=1606134&r2=1606135&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Fri Jun 27 
15:50:05 2014
@@ -581,6 +581,18 @@ public class Request
 return mappingData.context;
 }
 
+/**
+ * @param context The newly associated Context
+ * @deprecated Use setters on {@link #getMappingData() MappingData} object.
+ * Depending on use case, you may need to update other
+ * MappingData fields as well, such as
+ * contextSlashCount and host.
+ */
+@Deprecated
+public void setContext(Context context) {
+mappingData.context = context;
+}
+
 
 /**
  * Filter chain associated with the request.
@@ -702,6 +714,18 @@ public class Request
 return mappingData.wrapper;
 }
 
+/**
+ * @param wrapper The newly associated Wrapper
+ * @deprecated Use setters on {@link #getMappingData() MappingData} object.
+ * Depending on use case, you may need to update other
+ * MappingData fields as well, such as context
+ * and contextSlashCount.
+ */
+@Deprecated
+public void setWrapper(Wrapper wrapper) {
+mappingData.wrapper = wrapper;
+}
+
 
 // - Request Public Methods
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1606135&r1=1606134&r2=1606135&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jun 27 15:50:05 2014
@@ -77,8 +77,8 @@
 work in Mapper. (kkolinko)
   
   
-Remove context and wrapper fields and setters
-from Request class. (kkolinko)
+Remove context and wrapper fields and
+deprecate their setters in Request class. (kkolinko)
   
   
 56665: Correct the generation of the effective web.xml when



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1606136 - in /tomcat/trunk: java/org/apache/catalina/connector/InputBuffer.java java/org/apache/coyote/AbstractProtocol.java java/org/apache/coyote/http11/filters/IdentityInputFilter.java

[remm]

Author: remm
Date: Fri Jun 27 15:52:03 2014
New Revision: 1606136

URL: http://svn.apache.org/r1606136
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56663
BZ56663: Improve available to also include buffered bytes in the Servlet layer, 
handle a case (thanks telnet) where the amount of remaining bytes could become 
negative (the input is still finished then of course), filter an extra write 
event with non blocking write IO if async completes after the first read.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1606136&r1=1606135&r2=1606136&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Fri Jun 27 
15:52:03 2014
@@ -266,7 +266,17 @@ public class InputBuffer extends Reader
 
 
 public boolean isFinished() {
-return coyoteRequest.isFinished();
+int available = 0;
+if (state == BYTE_STATE) {
+available = bb.getLength();
+} else if (state == CHAR_STATE) {
+available = cb.getLength();
+}
+if (available > 0) {
+return false;
+} else {
+return coyoteRequest.isFinished();
+}
 }
 
 

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1606136&r1=1606135&r2=1606136&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Fri Jun 27 
15:52:03 2014
@@ -651,6 +651,9 @@ public abstract class AbstractProtocolhttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java?rev=1606136&r1=1606135&r2=1606136&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java 
Fri Jun 27 15:52:03 2014
@@ -214,6 +214,6 @@ public class IdentityInputFilter impleme
 public boolean isFinished() {
 // Only finished if a content length is defined and there is no data
 // remaining
-return contentLength > -1 && remaining == 0;
+return contentLength > -1 && remaining <= 0;
 }
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1606136&r1=1606135&r2=1606136&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jun 27 15:52:03 2014
@@ -90,6 +90,15 @@
   
 
   
+  
+
+  
+56663: Fix edge cases demonstrated by ByteCounter relating
+to data available, remaining and extra write events, mostly occurring
+with non blocking Servlet 3.1. (remm)
+  
+
+  
   
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 56663] Can not get all data from InputStream in onDataAvailable

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=56663

Remy Maucherat  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

--- Comment #7 from Remy Maucherat  ---
I could reproduce a number of bad behaviors using ByteCounter, not limited
exclusively to onDataAvailable. r1606136, will be included in 8.0.10.

-- 
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: Time for 7.0.55

[Konstantin Kolinko]

2014-06-27 18:16 GMT+04:00 Mark Thomas :
> On 23/06/2014 14:00, Violeta Georgieva wrote:
>> 2014-06-22 21:33 GMT+03:00 Konstantin Kolinko :
>>>
>>> 2014-06-20 23:59 GMT+04:00 Violeta Georgieva :
 Hi,

 I would like to start preparing Tomcat 7.0.55 for voting this weekend.
 If you want to include something in addition to this release, reply
>> here.

>>>
>>> Hi!
>>>
>>> The Mapper issues are taking longer than I anticipated, and I expect
>>> myself to be busy on the start of next week.  It is impeded by
>>> implementation differences (Tomcat 7 has two mappers: in Connector and
>>> in Context, Tomcat 8 has one).
>>>
>>> I would like to backport fixes for 56653 and 56658 to Tomcat 7  (the
>>> latter has not been fixed in trunk yet) along with other improvements.
>>>
>>> I expect that fixing those issues requires changing internal classes
>>> of Mapper like I did in r1604319.  I think that we are OK with such
>>> change, as those are our internal APIs.
>>>
>>>
>>> The Tomcat-Native binaries for Windows are linked to an old version of
>>> OpenSSL that has known security issues.  Christopher has not yet
>>> succeeded in building it.
>>
>> Ok I'll wait for you and Chris.
>> Meanwhile the new JDT compiler will be officially released (Luna release -
>> 25.06) and we may include it in 7.0.55.
>
> I know we are still waiting for the fixed Windows binaries. What is the
> status of the remaining work?

Mapper issues:
BZ 44312: Fixed. Proposed for 6.0.

BZ 56653: Fix re-implemented in Tomcat 8 to be less intrusive.
Not backported.
I backported testcase for it (r1604846), but neither Gump nor Testbot
fail with it.

BZ 56658: Not started.

I plan to work on Mapper tonight and tomorrow.


Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1606147 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

[remm]

Author: remm
Date: Fri Jun 27 16:31:04 2014
New Revision: 1606147

URL: http://svn.apache.org/r1606147
Log:
Avoid NPE.

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1606147&r1=1606146&r2=1606147&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
Fri Jun 27 16:31:04 2014
@@ -260,7 +260,9 @@ public abstract class WsRemoteEndpointIm
 messageParts.add(new MessagePart(opCode, payload, last,
 new EndMessageHandler(this, handler)));
 
-messageParts = transformation.sendMessagePart(messageParts);
+if (transformation != null) {
+messageParts = transformation.sendMessagePart(messageParts);
+}
 
 MessagePart mp = messageParts.remove(0);
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1606147 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

[Mark Thomas]

On 27/06/2014 17:31, r...@apache.org wrote:
> Author: remm
> Date: Fri Jun 27 16:31:04 2014
> New Revision: 1606147
> 
> URL: http://svn.apache.org/r1606147
> Log:
> Avoid NPE.
> 
> Modified:
> 
> tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

How did you get an NPE here? It shouldn't be possible.

Mark


> 
> Modified: 
> tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1606147&r1=1606146&r2=1606147&view=diff
> ==
> --- 
> tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
> (original)
> +++ 
> tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
> Fri Jun 27 16:31:04 2014
> @@ -260,7 +260,9 @@ public abstract class WsRemoteEndpointIm
>  messageParts.add(new MessagePart(opCode, payload, last,
>  new EndMessageHandler(this, handler)));
>  
> -messageParts = transformation.sendMessagePart(messageParts);
> +if (transformation != null) {
> +messageParts = transformation.sendMessagePart(messageParts);
> +}
>  
>  MessagePart mp = messageParts.remove(0);
>  
> 
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1606114 - in /tomcat/trunk: build.xml webapps/docs/changelog.xml

[Mark Thomas]

On 27/06/2014 16:01, kkoli...@apache.org wrote:
> Author: kkolinko
> Date: Fri Jun 27 15:01:55 2014
> New Revision: 1606114
> 
> URL: http://svn.apache.org/r1606114
> Log:
> When Eclipse Compiler JAR is updated, make sure to delete its old version 
> from the build/lib directory.

-1. I use a shared lib directory for multiple Tomcat versions (to save
having multiple copies of the same libs) and this breaks that.

Also, we don't do this (and never have done this) for any other lib so I
see no reason to just do it for this one.

Mark


> 
> Modified:
> tomcat/trunk/build.xml
> tomcat/trunk/webapps/docs/changelog.xml
> 
> Modified: tomcat/trunk/build.xml
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1606114&r1=1606113&r2=1606114&view=diff
> ==
> --- tomcat/trunk/build.xml (original)
> +++ tomcat/trunk/build.xml Fri Jun 27 15:01:55 2014
> @@ -1044,10 +1044,19 @@
>
>  
>  
> +
> +
> +
> +
> +  
> +
> +
> +  
> +
> +
> +
>  
>  
> -
> -
>
>  
>
> 
> Modified: tomcat/trunk/webapps/docs/changelog.xml
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1606114&r1=1606113&r2=1606114&view=diff
> ==
> --- tomcat/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/trunk/webapps/docs/changelog.xml Fri Jun 27 15:01:55 2014
> @@ -125,6 +125,11 @@
>  Update the API stability section of the release notes now that 
> Tomcat 8
>  has had its first stable release. (markt)
>
> +  
> +Improve build.xml so that when Eclipse JDT Compiler is
> +updated, it will delete the old JAR from build/lib
> +directory. (kkolinko)
> +  
>  
>
>  
> 
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1606147 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

[Rémy Maucherat]

2014-06-27 18:50 GMT+02:00 Mark Thomas :

> > URL: http://svn.apache.org/r1606147
> > Log:
> > Avoid NPE.
> >
> > Modified:
> >
> tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
>
> How did you get an NPE here? It shouldn't be possible.
>

Just running the testsuite (NIO2, didn't try anything else), lots of
websockets failures with an NPE on that. The CI runs should reproduce it.

Rémy

Re: svn commit: r1606114 - in /tomcat/trunk: build.xml webapps/docs/changelog.xml

[Konstantin Kolinko]

2014-06-27 20:52 GMT+04:00 Mark Thomas :
> On 27/06/2014 16:01, kkoli...@apache.org wrote:
>> Author: kkolinko
>> Date: Fri Jun 27 15:01:55 2014
>> New Revision: 1606114
>>
>> URL: http://svn.apache.org/r1606114
>> Log:
>> When Eclipse Compiler JAR is updated, make sure to delete its old version 
>> from the build/lib directory.
>
> -1. I use a shared lib directory for multiple Tomcat versions (to save
> having multiple copies of the same libs) and this breaks that.

This change is about duplicates in output/build/lib directory.. It
does not change anything for ${base.path} directory where the
libraries are downloaded.

How does your configuration behave when you have both
output/build/lib/ecj-4.4RC4.jar  and
output/build/lib/ecj-4.4.jar
in Tomcat's ${catalina.home}/lib directory at runtime?


I think this is useful, but I can revert this commit, as ECJ version
updates do not happen often.

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1606114 - in /tomcat/trunk: build.xml webapps/docs/changelog.xml

[Mark Thomas]

On 27/06/2014 18:21, Konstantin Kolinko wrote:
> 2014-06-27 20:52 GMT+04:00 Mark Thomas :
>> On 27/06/2014 16:01, kkoli...@apache.org wrote:
>>> Author: kkolinko
>>> Date: Fri Jun 27 15:01:55 2014
>>> New Revision: 1606114
>>>
>>> URL: http://svn.apache.org/r1606114
>>> Log:
>>> When Eclipse Compiler JAR is updated, make sure to delete its old version 
>>> from the build/lib directory.
>>
>> -1. I use a shared lib directory for multiple Tomcat versions (to save
>> having multiple copies of the same libs) and this breaks that.
> 
> This change is about duplicates in output/build/lib directory.. It
> does not change anything for ${base.path} directory where the
> libraries are downloaded.
> 
> How does your configuration behave when you have both
> output/build/lib/ecj-4.4RC4.jar  and
> output/build/lib/ecj-4.4.jar
> in Tomcat's ${catalina.home}/lib directory at runtime?
> 
> 
> I think this is useful, but I can revert this commit, as ECJ version
> updates do not happen often.

My bad. Ignore my -1.

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 43925] org.apache.jasper.runtime.BodyContentImpl causing huge memory allocations

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=43925

--- Comment #13 from Brian Remmington 
 ---
Hi Issa

It's been a while since I raised this (6 years), so I had to refresh my memory.

I've just checked out the trunk of Tomcat 8, and the same problem exists, and I
still think my code addresses it.

Your final sentence describes exactly what my suggested solution does: it
improves the way the buffer grows to reduce array copies and reduce garbage
collection. Your other comments don't relate to my proposal.

In the current Tomcat class (org.apache.jasper.runtime.BodyContentImpl), the
problem is with the method reAllocBuff(int) which is right at the bottom of the
class. This is called when the buffer array (cb) needs to grow, and it's
terribly inefficient.

My code replaces cb with an instance (named "buffer") of a new class CharBuffer
which manages a LinkedList of char arrays to ensure that, upon growth
(CharBuffer.grow), no array copy occurs, and nothing is left to the garbage
collector.

-- 
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 failure in ASF Buildbot on tomcat-trunk

[buildbot]

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/222

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1606072
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: Time for 7.0.55

[Christopher Schultz]

Mark,

On 6/27/14, 10:16 AM, Mark Thomas wrote:
>> Ok I'll wait for you and Chris.
>> Meanwhile the new JDT compiler will be officially released (Luna release -
>> 25.06) and we may include it in 7.0.55.
> 
> I know we are still waiting for the fixed Windows binaries. What is the
> status of the remaining work?

I'm stuck and need some help from someone who understands the build
process better. I don't see myself making any progress alone.

Any volunteers?

-chris



signature.asc
Description: OpenPGP digital signature

[Bug 56027] Unable to use TCN on RHEL6 boxes if box is booted in fips mode

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=56027

--- Comment #20 from Christopher Schultz  ---
I believe the "SSL2 MD5" routines problem is different from this issue, which
was to allow Tomcat to start up with OpenSSL already in FIPS mode (e.g. don't
choke and die if we're already in FIPS mode).

Next, Tomcat tries to initialize the SSL endpoint with a list of ciphers and I
think it request too many ciphers (and violates FIPS requirements). I'm not
sure why this fails when already in FIPS mode versus working when explicitly
entering FIPS mode first. I thought this failure had been reported elewhere but
I can't seem to find the reference right 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

buildbot success in ASF Buildbot on tomcat-trunk

[buildbot]

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/223

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1606147
Blamelist: kkolinko,markt,remm

Build succeeded!

sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1606226 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

[remm]

Author: remm
Date: Fri Jun 27 21:00:56 2014
New Revision: 1606226

URL: http://svn.apache.org/r1606226
Log:
Revert null check to check the full testsuite results (sorry for the noise).

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1606226&r1=1606225&r2=1606226&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
Fri Jun 27 21:00:56 2014
@@ -260,9 +260,7 @@ public abstract class WsRemoteEndpointIm
 messageParts.add(new MessagePart(opCode, payload, last,
 new EndMessageHandler(this, handler)));
 
-if (transformation != null) {
-messageParts = transformation.sendMessagePart(messageParts);
-}
+messageParts = transformation.sendMessagePart(messageParts);
 
 MessagePart mp = messageParts.remove(0);
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 56596] OpenSSL 1.0.1g is vulnerable to a man-in-the-middle attack

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=56596

--- Comment #6 from Christopher Schultz  ---
Jeffrey, if you take a look at my post here
(http://markmail.org/message/gex3hshaprlxcuzs), you'll find a DOS batch file
that, with a few prerequisites, will download and build the 32-bit x86
openssl.exe and a statically-linked 32-bit x86 libtcnative-1.dll for you. (It
downloads and builds all of the dependencies -- OpenSSL and APR, first).

I'm really only having trouble building the 64-bit flavors at this point.

My instructions were followed using a freely-downloadable Windows 8.1
VirtualBox image, so you can use and abuse it without mucking-up your own
system.

Please join that thread on the dev list to discuss further. This is enough
abuse of Bugzilla for 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

buildbot failure in ASF Buildbot on tomcat-trunk

[buildbot]

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/224

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1606226
Blamelist: remm

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: r1606271 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

[remm]

Author: remm
Date: Fri Jun 27 23:50:46 2014
New Revision: 1606271

URL: http://svn.apache.org/r1606271
Log:
Add back the NPE check for now since the testsuite confirms it with all 
connectors.
http://ci.apache.org/builders/tomcat-trunk/builds/224/steps/compile_1/logs/stdio

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1606271&r1=1606270&r2=1606271&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
Fri Jun 27 23:50:46 2014
@@ -260,7 +260,9 @@ public abstract class WsRemoteEndpointIm
 messageParts.add(new MessagePart(opCode, payload, last,
 new EndMessageHandler(this, handler)));
 
-messageParts = transformation.sendMessagePart(messageParts);
+if (transformation != null) {
+messageParts = transformation.sendMessagePart(messageParts);
+}
 
 MessagePart mp = messageParts.remove(0);
 



-
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

[buildbot]

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/225

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1606271
Blamelist: remm

Build succeeded!

sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org