Author: violetagg
Date: Sat Sep 13 05:47:11 2014
New Revision: 1624699

URL: http://svn.apache.org/r1624699
Log:
Merged revision 1604768 from tomcat/trunk:
Starting to look at WebSocket compression. These implementations will be 
required to process the extension negotiation.

Added:
    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsExtension.java
      - copied, changed from r1604768, 
tomcat/trunk/java/org/apache/tomcat/websocket/WsExtension.java
    
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsExtensionParameter.java
      - copied unchanged from r1604768, 
tomcat/trunk/java/org/apache/tomcat/websocket/WsExtensionParameter.java
Modified:
    tomcat/tc7.0.x/trunk/   (props changed)

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1604768

Copied: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsExtension.java 
(from r1604768, tomcat/trunk/java/org/apache/tomcat/websocket/WsExtension.java)
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsExtension.java?p2=tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsExtension.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/WsExtension.java&r1=1604768&r2=1624699&rev=1624699&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsExtension.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsExtension.java Sat 
Sep 13 05:47:11 2014
@@ -24,7 +24,7 @@ import javax.websocket.Extension;
 public class WsExtension implements Extension {
 
     private final String name;
-    private final List<Parameter> parameters = new ArrayList<>();
+    private final List<Parameter> parameters = new ArrayList<Parameter>();
 
     WsExtension(String name) {
         this.name = name;



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

Reply via email to