Fixed issue with row context method: isRowRequest

ep2p · Sep 14, 2020 · d0fa601 · d0fa601
1 parent e8ca358
commit d0fa601
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>lab.idioglossia</groupId>
 	<artifactId>springboot-row-starter</artifactId>
-	<version>1.3.2-RELEASE</version>
+	<version>1.3.3-RELEASE</version>
 	<name>Springboot Rest Over Websocket Starter</name>
 	<description>Spring boot starter for Rest Over Websocket</description>
 	<developers>

diff --git a/src/main/java/lab/idioglossia/row/context/DefaultContextImpl.java b/src/main/java/lab/idioglossia/row/context/DefaultContextImpl.java
@@ -2,15 +2,17 @@
 
 public class DefaultContextImpl implements RowContext {
     private volatile RowUser rowUser;
+    private final boolean rowRequest;
     private static final long serialVersionUID = 100L;
 
-    public DefaultContextImpl(RowUser rowUser) {
+    public DefaultContextImpl(RowUser rowUser, boolean isRowRequest) {
         this.rowUser = rowUser;
+        this.rowRequest = isRowRequest;
     }
 
     @Override
     public boolean isRowRequest() {
-        return true;
+        return this.rowRequest;
     }
 
     @Override

diff --git a/src/main/java/lab/idioglossia/row/context/ThreadLocalRowContextHolderStrategy.java b/src/main/java/lab/idioglossia/row/context/ThreadLocalRowContextHolderStrategy.java
@@ -29,6 +29,6 @@ public void setContext(RowContext rowContext) {
 
     @Override
     public RowContext createEmptyContext() {
-        return new DefaultContextImpl(new RowUser());
+        return new DefaultContextImpl(new RowUser(), false);
     }
 }
diff --git a/src/main/java/lab/idioglossia/row/service/ProtocolService.java b/src/main/java/lab/idioglossia/row/service/ProtocolService.java
@@ -77,7 +77,7 @@ public void handle(RowWebsocketSession webSocketSession, TextMessage textMessage
     private void fillContext(WebSocketSession webSocketSession) {
         RowContextHolder.setContext(
                 new DefaultContextImpl(
-                        new RowUser((String) webSocketSession.getAttributes().get(Naming.USER_ID_ATTRIBUTE_NAME), webSocketSession.getId())
+                        new RowUser((String) webSocketSession.getAttributes().get(Naming.USER_ID_ATTRIBUTE_NAME), webSocketSession.getId()), true
                 )
         );
     }