[jbossws-commits] JBossWS SVN: r11898 - in stack/native/tags/jbossws-native-3.3.0.CR1.SP1: modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2010-03-30 07:26:33 -0400 (Tue, 30 Mar 2010)
New Revision: 11898

Modified:
   stack/native/tags/jbossws-native-3.3.0.CR1.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/AbstractNettyMessage.java
   stack/native/tags/jbossws-native-3.3.0.CR1.SP1/pom.xml
Log:
[JBWS-2979][NETTY-237] switching to Netty 3.2.0.BETA1 and removing obsolete hack

Modified: stack/native/tags/jbossws-native-3.3.0.CR1.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/AbstractNettyMessage.java
===================================================================
--- stack/native/tags/jbossws-native-3.3.0.CR1.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/AbstractNettyMessage.java	2010-03-30 11:22:51 UTC (rev 11897)
+++ stack/native/tags/jbossws-native-3.3.0.CR1.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/AbstractNettyMessage.java	2010-03-30 11:26:33 UTC (rev 11898)
@@ -128,6 +128,12 @@
       this.status = HttpResponseStatus.valueOf(sc);
    }
 
+   @Override
+   public final void setStatus(HttpResponseStatus sc)
+   {
+      this.status = sc;
+   }
+
    /**
     * Sets cookis to response.
     */
@@ -205,44 +211,8 @@
          key = header.getName();
          List<String> values = new LinkedList<String>();
          values.add(header.getValue());
-         values = this.removeProhibitedCharacters(values);
          this.setHeader(key, values);
       }
    }
 
-   // TODO: https://jira.jboss.org/jira/browse/NETTY-237
-   /**
-    * Removes prohibited header value characters.
-    * 
-    * @param values header values before optimization
-    * @return optimized header values
-    */
-   private List<String> removeProhibitedCharacters(final List<String> values)
-   {
-      final List<String> retVal = new LinkedList<String>();
-      for (int i = 0; i < values.size(); i++)
-      {
-         retVal.add(i, this.removeProhibitedCharacters(values.get(i)));
-      }
-
-      return retVal;
-   }
-
-   // TODO: https://jira.jboss.org/jira/browse/NETTY-237
-   /**
-    * Removes prohibited header value characters.
-    * 
-    * @param value header value before optimization
-    * @return optimized header value
-    */
-   private String removeProhibitedCharacters(final String value)
-   {
-      String retVal = value;
-
-      retVal = retVal.replace('\r', ' ');
-      retVal = retVal.replace('\n', ' ');
-
-      return retVal;
-   }
-
 }

Modified: stack/native/tags/jbossws-native-3.3.0.CR1.SP1/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.3.0.CR1.SP1/pom.xml	2010-03-30 11:22:51 UTC (rev 11897)
+++ stack/native/tags/jbossws-native-3.3.0.CR1.SP1/pom.xml	2010-03-30 11:26:33 UTC (rev 11898)
@@ -70,7 +70,7 @@
     <jboss.jaxr.version>2.0.1</jboss.jaxr.version>
     <apache.scout.version>1.1.1</apache.scout.version>
     <juddi.version>0.9RC4</juddi.version>
-    <netty.version>3.1.5.GA</netty.version>
+    <netty.version>3.2.0.BETA1</netty.version>
     <sun.fastinfoset.version>1.2.2</sun.fastinfoset.version>
     <sun.jaxws.version>2.2</sun.jaxws.version>
     <sun.policy.version>2.0-b01</sun.policy.version>