Merge all changes from 1.5.2 branch into trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@830026 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 2 deletions

diff --git a/branches/sca-java-1.x/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java b/branches/sca-java-1.x/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
index 74dd0fdc97..0a437f9ae9 100644
--- a/branches/sca-java-1.x/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
+++ b/branches/sca-java-1.x/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
@@ -188,10 +188,10 @@ public class TransientNameService {
             } catch (Throwable e) {
                 // Ignore
             }
-
+            
             // Call destroy after close the acceptors
             // In JDK 1.6u14 or later, destroy clean up the acceptors but it doesn't close them
-            createdOrb.destroy();            
+            createdOrb.destroy();
             createdOrb = null;
         }
     }