Port fix for #167

modules/cpr/src/main/java/org/atmosphere/cpr/AsynchronousProcessor.java

@@ -505,7 +505,7 @@ public Action cancelled(HttpServletRequest req, HttpServletResponse res)
         return cancelledAction;
     }
 
-    void shutdown() {
+    protected void shutdown() {
         closedDetector.shutdownNow();
         for (AtmosphereResource<HttpServletRequest, HttpServletResponse> resource : aliveRequests.values()) {
             try {

modules/cpr/src/main/java/org/atmosphere/websocket/WebSocketProcessor.java

@@ -1,39 +1,17 @@
 /*
+ * Copyright 2012 Jeanfrancois Arcand
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
  *
- * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- *
- * Contributor(s):
- *
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
  */
 package org.atmosphere.websocket;
 

modules/jersey/src/main/java/org/atmosphere/jersey/AtmosphereFilter.java

@@ -274,6 +274,7 @@ public ContainerResponse filter(final ContainerRequest request, final ContainerR
                         }
                     }
 
+
                     if (transport == null || broadcasterName == null) {
                         StringBuffer s = new StringBuffer();
                         Enumeration<String> e = servletReq.getHeaderNames();

modules/jersey/src/main/java/org/atmosphere/jersey/util/JerseyBroadcasterUtil.java

@@ -91,7 +91,7 @@ public final static void broadcast(final AtmosphereResource<?, ?> r, final Atmos
             if (cr != null) {
                 cr.setEntity(null);
             }
-
+            e.setMessage(null);
             Boolean resumeOnBroadcast = (Boolean) request.getAttribute(ApplicationConfig.RESUME_ON_BROADCAST);
             if (resumeOnBroadcast != null && resumeOnBroadcast) {