cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1304428 - in /cxf/branches/2.5.x-fixes/distribution/src/main/release/samples: ws_rm/src/main/java/demo/ws_rm/client/ ws_security/sign_enc/src/main/java/demo/wssec/client/ ws_security/ut/src/demo/wssec/client/ ws_security/ut_sign/src/main/j...
Date Fri, 23 Mar 2012 15:16:27 GMT
Author: dkulp
Date: Fri Mar 23 15:16:27 2012
New Revision: 1304428

URL: http://svn.apache.org/viewvc?rev=1304428&view=rev
Log:
Merged revisions 1304373 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1304373 | dkulp | 2012-03-23 10:33:47 -0400 (Fri, 23 Mar 2012) | 2 lines

  Close the proxies so the decoupled endpoints can cleanly shutdown

........

Modified:
    cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java
    cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
    cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/Client.java
    cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java

Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java?rev=1304428&r1=1304427&r2=1304428&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java
(original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java
Fri Mar 23 15:16:27 2012
@@ -19,6 +19,7 @@
 
 package demo.ws_rm.client;
 
+import java.io.Closeable;
 import java.io.File;
 import java.lang.reflect.UndeclaredThrowableException;
 import java.net.URL;
@@ -75,6 +76,9 @@ public final class Client {
             // allow aynchronous resends to occur
             Thread.sleep(30 * 1000);
 
+            if (port instanceof Closeable) {
+                ((Closeable)port).close();
+            }
             bus.shutdown(true);
 
         } catch (UndeclaredThrowableException ex) {

Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java?rev=1304428&r1=1304427&r2=1304428&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
(original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
Fri Mar 23 15:16:27 2012
@@ -19,6 +19,8 @@
 
 package demo.wssec.client;
 
+import java.io.Closeable;
+
 import java.lang.reflect.UndeclaredThrowableException;
 import java.net.URL;
 import java.util.HashMap;
@@ -107,6 +109,10 @@ public final class Client {
             // allow aynchronous resends to occur
             Thread.sleep(30 * 1000);
 
+            if (port instanceof Closeable) {
+                ((Closeable)port).close();
+            }
+
             bus.shutdown(true);
 
         } catch (UndeclaredThrowableException ex) {

Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/Client.java?rev=1304428&r1=1304427&r2=1304428&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/Client.java
(original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/client/Client.java
Fri Mar 23 15:16:27 2012
@@ -19,6 +19,7 @@
 
 package demo.wssec.client;
 
+import java.io.Closeable;
 import java.lang.reflect.UndeclaredThrowableException;
 import java.net.URL;
 import java.util.HashMap;
@@ -77,6 +78,9 @@ public final class Client {
                 System.out.println("response: " + response + "\n");
 
             }
+            if (port instanceof Closeable) {
+                ((Closeable)port).close();
+            }
 
             bus.shutdown(true);
 

Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java?rev=1304428&r1=1304427&r2=1304428&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java
(original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java
Fri Mar 23 15:16:27 2012
@@ -19,6 +19,7 @@
 
 package demo.wssec.client;
 
+import java.io.Closeable;
 import java.lang.reflect.UndeclaredThrowableException;
 import java.net.URL;
 import java.util.HashMap;
@@ -91,6 +92,10 @@ public final class Client {
                 String response = port.greetMe(names[i]);
                 System.out.println("response: " + response + "\n");
             }
+
+            if (port instanceof Closeable) {
+                ((Closeable)port).close();
+            }
             
             bus.shutdown(true);
 



Mime
View raw message