From 38c330c7e4c84a71ccf0c55f15d12da077b5b6b7 Mon Sep 17 00:00:00 2001 From: jfarcand Date: Mon, 2 Apr 2012 13:40:09 -0400 Subject: [PATCH] Fix typo and logic --- .../src/main/java/org/atmosphere/cpr/AtmosphereRequest.java | 6 +++--- .../handler/AbstractReflectorAtmosphereHandler.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereRequest.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereRequest.java index f6bc16d73e4..46cf465f4a6 100644 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereRequest.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereRequest.java @@ -102,7 +102,7 @@ private void configureStream(byte[] bytes, int offset, int length, String encodi } } - public boolean destroybed() { + public boolean destroyed() { return destroyed.get(); } @@ -151,7 +151,7 @@ public String getRequestedSessionId() { */ @Override public String getMethod() { - return b.methodType; + return b.methodType != null ? b.methodType : b.request.getMethod(); } /** @@ -846,7 +846,7 @@ public final static class Builder { private int offset; private int length; private String encoding = "UTF-8"; - private String methodType = "GET"; + private String methodType; private String contentType; private String data; private Map headers = new HashMap(); diff --git a/modules/cpr/src/main/java/org/atmosphere/handler/AbstractReflectorAtmosphereHandler.java b/modules/cpr/src/main/java/org/atmosphere/handler/AbstractReflectorAtmosphereHandler.java index 0d940e904be..13505ac5bb7 100644 --- a/modules/cpr/src/main/java/org/atmosphere/handler/AbstractReflectorAtmosphereHandler.java +++ b/modules/cpr/src/main/java/org/atmosphere/handler/AbstractReflectorAtmosphereHandler.java @@ -91,7 +91,7 @@ public void onStateChange(AtmosphereResourceEvent event) throws IOException { Object message = event.getMessage(); - if (message == null || event.isCancelled() || event.getResource().getRequest().destroybed()) return; + if (message == null || event.isCancelled() || event.getResource().getRequest().destroyed()) return; if (event.getResource().getSerializer() != null) { try {