More fixes for #1529

Atmosphere · Mar 24, 2014 · 328aedd · 328aedd
1 parent 441b4eb
commit 328aedd
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/handler/AbstractReflectorAtmosphereHandler.java b/modules/cpr/src/main/java/org/atmosphere/handler/AbstractReflectorAtmosphereHandler.java
@@ -19,11 +19,13 @@
 
 import org.atmosphere.cpr.ApplicationConfig;
 import org.atmosphere.cpr.AtmosphereHandler;
+import org.atmosphere.cpr.AtmosphereRequest;
 import org.atmosphere.cpr.AtmosphereResource;
 import org.atmosphere.cpr.AtmosphereResourceEvent;
 import org.atmosphere.cpr.AtmosphereResourceImpl;
 import org.atmosphere.cpr.AtmosphereResponse;
 import org.atmosphere.cpr.Broadcaster;
+import org.atmosphere.util.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -64,7 +66,9 @@ public void onStateChange(AtmosphereResourceEvent event)
         Object message = event.getMessage();
         AtmosphereResource resource = event.getResource();
         AtmosphereResponse r = resource.getResponse();
+        AtmosphereRequest request = resource.getRequest();
 
+        boolean writeAsBytes = IOUtils.isBodyBinary(request);
         if (message == null) {
             logger.trace("Message was null for AtmosphereEvent {}", event);
             return;
@@ -97,6 +101,9 @@ public void onStateChange(AtmosphereResourceEvent event)
                 } catch (IllegalStateException e) {
                     isUsingStream = true;
                 }
+                if (writeAsBytes) {
+                    throw new IllegalStateException("Cannot write bytes using PrintWriter");
+                }
             }
 
             if (message instanceof List) {
@@ -138,7 +145,7 @@ public void onStateChange(AtmosphereResourceEvent event)
                 }
             } else {
                 if (isUsingStream) {
-                    r.getOutputStream().write(message.toString().getBytes(r.getCharacterEncoding()));
+                    r.getOutputStream().write(writeAsBytes ? (byte[])message : message.toString().getBytes(r.getCharacterEncoding()));
                     r.getOutputStream().flush();
                 } else {
                     r.getWriter().write(message.toString());

diff --git a/modules/cpr/src/main/java/org/atmosphere/util/IOUtils.java b/modules/cpr/src/main/java/org/atmosphere/util/IOUtils.java
@@ -62,7 +62,8 @@ public static Object readEntirely(AtmosphereResource r) {
     }
 
     public final static boolean isBodyBinary(AtmosphereRequest request) {
-        if (request.getHeader(FORCE_BINARY) != null || request.getHeader(X_ATMO_BINARY) != null) return true;
+        if (request.getContentType() != null
+                && request.getContentType().equalsIgnoreCase(FORCE_BINARY) || request.getHeader(X_ATMO_BINARY) != null) return true;
         return false;
     }
 

diff --git a/modules/cpr/src/main/java/org/atmosphere/websocket/protocol/ProtocolUtil.java b/modules/cpr/src/main/java/org/atmosphere/websocket/protocol/ProtocolUtil.java
@@ -37,7 +37,7 @@ protected static AtmosphereRequest.Builder constructRequest(AtmosphereResource r
         AtmosphereRequest.Builder b = (new AtmosphereRequest.Builder()
                 .request(request)
                 .method(methodType)
-                .contentType(contentType)
+                .contentType(contentType == null ? request.getContentType() : contentType)
                 .attributes(m)
                 .pathInfo(pathInfo)
                 .requestURI(requestURI)

diff --git a/modules/cpr/src/main/java/org/atmosphere/websocket/protocol/SimpleHttpProtocol.java b/modules/cpr/src/main/java/org/atmosphere/websocket/protocol/SimpleHttpProtocol.java
@@ -46,7 +46,8 @@
 public class SimpleHttpProtocol implements WebSocketProtocol, Serializable {
 
     private static final Logger logger = LoggerFactory.getLogger(SimpleHttpProtocol.class);
-    protected String contentType = "text/plain";
+    protected final static String TEXT = "text/plain";
+    protected String contentType = TEXT;
     protected String methodType = "POST";
     protected String delimiter = "@@";
     protected boolean destroyable;
@@ -104,7 +105,7 @@ public List<AtmosphereRequest> onMessage(WebSocket webSocket, String message) {
         }
 
         List<AtmosphereRequest> list = new ArrayList<AtmosphereRequest>();
-        list.add(constructRequest(resource, pathInfo, requestURI, methodType, contentType, destroyable).body(message).build());
+        list.add(constructRequest(resource, pathInfo, requestURI, methodType, contentType.equalsIgnoreCase(TEXT) ? null : contentType, destroyable).body(message).build());
 
         return list;
     }
@@ -124,7 +125,7 @@ public List<AtmosphereRequest> onMessage(WebSocket webSocket, byte[] d, final in
         if (!resource.isInScope()) return Collections.emptyList();
 
         List<AtmosphereRequest> list = new ArrayList<AtmosphereRequest>();
-        list.add(constructRequest(resource, request.getPathInfo(), request.getRequestURI(), methodType, contentType, destroyable).body(d, offset, length).build());
+        list.add(constructRequest(resource, request.getPathInfo(), request.getRequestURI(), methodType, contentType.equalsIgnoreCase(TEXT) ? null : contentType, destroyable).body(d, offset, length).build());
 
         return list;
     }

diff --git a/modules/cpr/src/main/java/org/atmosphere/websocket/protocol/StreamingHttpProtocol.java b/modules/cpr/src/main/java/org/atmosphere/websocket/protocol/StreamingHttpProtocol.java
@@ -46,6 +46,7 @@
 public class StreamingHttpProtocol implements WebSocketProtocolStream {
 
     private static final Logger logger = LoggerFactory.getLogger(StreamingHttpProtocol.class);
+    protected final static String TEXT = "text/plain";
     protected String contentType = "text/plain";
     protected String methodType = "POST";
     protected String delimiter = "@@";
@@ -95,7 +96,7 @@ public List<AtmosphereRequest> onTextStream(WebSocket webSocket, Reader r) {
 
         AtmosphereRequest request = resource.getRequest();
         List<AtmosphereRequest> list = new ArrayList<AtmosphereRequest>();
-        list.add(constructRequest(resource, request.getPathInfo(), request.getRequestURI(), methodType, contentType, destroyable).reader(r).build());
+        list.add(constructRequest(resource, request.getPathInfo(), request.getRequestURI(), methodType, contentType.equalsIgnoreCase(TEXT) ? null : contentType, destroyable).reader(r).build());
 
         return list;
     }
@@ -111,7 +112,7 @@ public List<AtmosphereRequest> onBinaryStream(WebSocket webSocket, InputStream s
 
         AtmosphereRequest request = resource.getRequest();
         List<AtmosphereRequest> list = new ArrayList<AtmosphereRequest>();
-        list.add(constructRequest(resource, request.getPathInfo(), request.getRequestURI(), methodType, contentType, destroyable).inputStream(stream).build());
+        list.add(constructRequest(resource, request.getPathInfo(), request.getRequestURI(), methodType, contentType.equalsIgnoreCase(TEXT) ? null : contentType, destroyable).inputStream(stream).build());
 
         return list;
     }