svn commit: r573312 - in /incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http: endpoints/HttpConsumerEndpoint.java jetty/ServiceMixSslSocketConnector.java

[gnodet]

Author: gnodet
Date: Thu Sep  6 09:20:19 2007
New Revision: 573312

URL: http://svn.apache.org/viewvc?rev=573312&view=rev
Log:
Revert SM-1035

Modified:
    
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java
    
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/ServiceMixSslSocketConnector.java

Modified: 
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java?rev=573312&r1=573311&r2=573312&view=diff
==============================================================================
--- 
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java
 (original)
+++ 
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java
 Thu Sep  6 09:20:19 2007
@@ -219,7 +219,7 @@
             // Not giving a specific mutex will synchronize on the 
continuation itself
             Continuation cont = ContinuationSupport.getContinuation(request, 
null);
             // If the continuation is not a retry
-            if (!cont.isPending() && cont.isNew()) {
+            if (!cont.isPending()) {
                 exchange = createExchange(request);
                 locks.put(exchange.getExchangeId(), cont);
                 request.setAttribute(MessageExchange.class.getName(), 
exchange.getExchangeId());
@@ -234,7 +234,7 @@
                                             .getConsumerProcessorSuspendTime();
                     }
                     boolean result = cont.suspend(to);
-                    exchanges.remove(exchange.getExchangeId();
+                    exchanges.remove(exchange.getExchangeId());
                     if (!result) {
                         locks.remove(exchange.getExchangeId());
                         throw new Exception("Exchange timed out");

Modified: 
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/ServiceMixSslSocketConnector.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/ServiceMixSslSocketConnector.java?rev=573312&r1=573311&r2=573312&view=diff
==============================================================================
--- 
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/ServiceMixSslSocketConnector.java
 (original)
+++ 
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/jetty/ServiceMixSslSocketConnector.java
 Thu Sep  6 09:20:19 2007
@@ -23,8 +23,6 @@
 
 public class ServiceMixSslSocketConnector extends SslSocketConnector {
 
-    private String trustStore;
-
     private String keyAlias;
 
     private KeystoreManager keystoreManager;
@@ -59,23 +57,8 @@
         this.keyAlias = keyAlias;
     }
 
-    /**
-     * @return the trustStore
-     */
-    public String getTrustStore() {
-        return trustStore;
-    }
-
-    /**
-     * @param trustStore
-     *            the trustStore to set
-     */
-    public void setTrustStore(String trustStore) {
-        this.trustStore = trustStore;
-    }
-
     protected SSLServerSocketFactory createFactory() throws Exception {
         return keystoreManager.createSSLServerFactory(getProvider(), 
getProtocol(), getSslKeyManagerFactoryAlgorithm(),
-                        getKeystore(), getKeyAlias(), getTrustStore());
+                        getKeystore(), getKeyAlias(), getTruststore());
     }
 }