From 6cd08b2928332da379c6132fb754cf66eddda943 Mon Sep 17 00:00:00 2001 From: runningship Date: Wed, 31 Dec 2014 11:15:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?web=20socket=20=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/java_websocket/WebSocket.java | 3 +++ src/main/java/org/java_websocket/WebSocketImpl.java | 8 ++++++++ src/test/java/AutobahnClientTest.java | 6 ++++++ 3 files changed, 17 insertions(+) diff --git a/src/main/java/org/java_websocket/WebSocket.java b/src/main/java/org/java_websocket/WebSocket.java index a661eddbf..672d7e526 100644 --- a/src/main/java/org/java_websocket/WebSocket.java +++ b/src/main/java/org/java_websocket/WebSocket.java @@ -3,6 +3,7 @@ import java.net.InetSocketAddress; import java.nio.ByteBuffer; import java.nio.channels.NotYetConnectedException; +import java.util.Map; import org.java_websocket.drafts.Draft; import org.java_websocket.framing.Framedata; @@ -121,4 +122,6 @@ public enum READYSTATE { * If the opening handshake has not yet happened it will return null. **/ public abstract String getResourceDescriptor(); + + public abstract Map getAttributes(); } \ No newline at end of file diff --git a/src/main/java/org/java_websocket/WebSocketImpl.java b/src/main/java/org/java_websocket/WebSocketImpl.java index 669bee146..034c7509c 100644 --- a/src/main/java/org/java_websocket/WebSocketImpl.java +++ b/src/main/java/org/java_websocket/WebSocketImpl.java @@ -9,7 +9,9 @@ import java.nio.channels.SelectionKey; import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; @@ -104,6 +106,7 @@ public class WebSocketImpl implements WebSocket { private String resourceDescriptor = null; + public Map attrs = new HashMap(); /** * crates a websocket with server role */ @@ -734,4 +737,9 @@ public String getResourceDescriptor() { return resourceDescriptor; } + @Override + public Map getAttributes() { + return attrs; + } + } diff --git a/src/test/java/AutobahnClientTest.java b/src/test/java/AutobahnClientTest.java index a567fd1b4..b0c397e96 100644 --- a/src/test/java/AutobahnClientTest.java +++ b/src/test/java/AutobahnClientTest.java @@ -3,6 +3,7 @@ import java.io.InputStreamReader; import java.net.URI; import java.nio.ByteBuffer; +import java.util.Map; import org.java_websocket.WebSocket; import org.java_websocket.WebSocketImpl; @@ -159,5 +160,10 @@ public void onWebsocketMessageFragment( WebSocket conn, Framedata frame ) { builder.setTransferemasked( true ); getConnection().sendFrame( frame ); } + @Override + public Map getAttributes() { + // TODO Auto-generated method stub + return null; + } } From d717270fff3d52f8152b95b8f7af5d257f80e8fc Mon Sep 17 00:00:00 2001 From: runningship Date: Wed, 21 Jan 2015 18:08:40 +0800 Subject: [PATCH 2/2] update pom --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9189fba8d..91b30b268 100644 --- a/pom.xml +++ b/pom.xml @@ -12,8 +12,8 @@ 4.0.0 org.java-websocket - Java-WebSocket - 1.3.1-SNAPSHOT + bc-Java-WebSocket + 0.1 jar Java WebSocket http://java-websocket.org/