geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r208861 - /geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/server/AxisWebServiceContainer.java
Date Sat, 02 Jul 2005 18:26:24 GMT
Author: djencks
Date: Sat Jul  2 11:26:23 2005
New Revision: 208861

URL: http://svn.apache.org/viewcvs?rev=208861&view=rev
Log:
GERONIMO-692 apparent fix.  I'm not sure this is the best solution, but it appears to work

Modified:
    geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/server/AxisWebServiceContainer.java

Modified: geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/server/AxisWebServiceContainer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/server/AxisWebServiceContainer.java?rev=208861&r1=208860&r2=208861&view=diff
==============================================================================
--- geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/server/AxisWebServiceContainer.java
(original)
+++ geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/server/AxisWebServiceContainer.java
Sat Jul  2 11:26:23 2005
@@ -138,13 +138,13 @@
                 SOAPConstants soapConstants = messageContext.getSOAPConstants();
                 String contentType1 = responseMessage.getContentType(soapConstants);
                 res.setContentType(contentType1);
-                    // Transfer MIME headers to HTTP headers for response message.
-                    MimeHeaders responseMimeHeaders = responseMessage.getMimeHeaders();
-                    for (Iterator i = responseMimeHeaders.getAllHeaders(); i.hasNext(); )
{
-                        MimeHeader responseMimeHeader = (MimeHeader) i.next();
-                        res.setHeader(responseMimeHeader.getName(),
-                                      responseMimeHeader.getValue());
-                    }
+                // Transfer MIME headers to HTTP headers for response message.
+                MimeHeaders responseMimeHeaders = responseMessage.getMimeHeaders();
+                for (Iterator i = responseMimeHeaders.getAllHeaders(); i.hasNext();) {
+                    MimeHeader responseMimeHeader = (MimeHeader) i.next();
+                    res.setHeader(responseMimeHeader.getName(),
+                            responseMimeHeader.getValue());
+                }
                 //TODO discuss this with dims.
 //                // synchronize the character encoding of request and response
 //                String responseEncoding = (String) messageContext.getProperty(
@@ -157,10 +157,10 @@
 //                        log.info(Messages.getMessage("exception00"), e);
 //                    }
 //                }
-                    //determine content type from message response
-                    contentType = responseMessage.getContentType(messageContext.
-                            getSOAPConstants());
-                    responseMessage.writeTo(res.getOutputStream());
+                //determine content type from message response
+                contentType = responseMessage.getContentType(messageContext.
+                        getSOAPConstants());
+                responseMessage.writeTo(res.getOutputStream());
             } catch (Exception e) {
                 log.info(Messages.getMessage("exception00"), e);
             }
@@ -240,15 +240,16 @@
         if (wsdl == null) {
             throw new IllegalStateException("No wsdl or schema known at location: " + locationKey);
         }
-            URI updated = new URI(realLocation.getScheme(),
-                    realLocation.getUserInfo(),
-                    realLocation.getHost(),
-                    realLocation.getPort(),
-                    null,  //try null for no path
-                    null,
-                    null);
-            String replaced = ((String)wsdl).replaceAll(LOCATION_REPLACEMENT_TOKEN, updated.toString());
-            response.getOutputStream().write(replaced.getBytes());
+        URI updated = new URI(realLocation.getScheme(),
+                realLocation.getUserInfo(),
+                realLocation.getHost(),
+                realLocation.getPort(),
+                null, //try null for no path
+                null,
+                null);
+        String replaced = ((String) wsdl).replaceAll(LOCATION_REPLACEMENT_TOKEN, updated.toString());
+        response.getOutputStream().write(replaced.getBytes());
+        response.getOutputStream().flush();
     }
 
     public URI getLocation() {



Mime
View raw message