[jboss-cvs] JBossAS SVN: r110449 - in branches/JBPAPP_5_1_0_Final_JBPAPP-5820/iiop/src: main/org/jboss/iiop and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: raggz
Date: 2011-01-26 06:52:29 -0500 (Wed, 26 Jan 2011)
New Revision: 110449

Modified:
   branches/JBPAPP_5_1_0_Final_JBPAPP-5820/iiop/src/etc/iiop-service.xml
   branches/JBPAPP_5_1_0_Final_JBPAPP-5820/iiop/src/main/org/jboss/iiop/CorbaORBService.java
   branches/JBPAPP_5_1_0_Final_JBPAPP-5820/iiop/src/main/org/jboss/iiop/CorbaORBServiceMBean.java
Log:
This is a fix for JIRA JBPAPP-5029 it goes into Patch JBPAPP-5820.

Modified: branches/JBPAPP_5_1_0_Final_JBPAPP-5820/iiop/src/etc/iiop-service.xml
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5820/iiop/src/etc/iiop-service.xml	2011-01-26 09:58:01 UTC (rev 110448)
+++ branches/JBPAPP_5_1_0_Final_JBPAPP-5820/iiop/src/etc/iiop-service.xml	2011-01-26 11:52:29 UTC (rev 110449)
@@ -52,6 +52,7 @@
     <attribute name="ORBSingletonDelegate">org.jacorb.orb.ORBSingleton</attribute>
     <attribute name="ORBPropertiesFileName">jacorb.properties</attribute>
     <attribute name="OTSContextPropagationEnabled">true</attribute>
+    <attribute name="ORBGracefulShutdown">false</attribute>
     <attribute name="Port">
        <!-- Get the port from the ServiceBindingManager -->
       <value-factory bean="ServiceBindingManager" method="getIntBinding" 

Modified: branches/JBPAPP_5_1_0_Final_JBPAPP-5820/iiop/src/main/org/jboss/iiop/CorbaORBService.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5820/iiop/src/main/org/jboss/iiop/CorbaORBService.java	2011-01-26 09:58:01 UTC (rev 110448)
+++ branches/JBPAPP_5_1_0_Final_JBPAPP-5820/iiop/src/main/org/jboss/iiop/CorbaORBService.java	2011-01-26 11:52:29 UTC (rev 110449)
@@ -71,6 +71,7 @@
    public static String POA_NAME = "JBossCorbaPOA";
    public static String IR_POA_NAME = "JBossCorbaInterfaceRepositoryPOA";
    public static String SSL_DOMAIN = "JBossCorbaSSLDomain";
+   
     
    // Attributes ----------------------------------------------------
 
@@ -83,6 +84,7 @@
    private int sslPort = 0;
    private String sslDomain = null;
    private boolean sunJDK14IsLocalBugFix = false;
+   private boolean gracefulShutdown = false;
 
    // Static --------------------------------------------------------
 
@@ -188,6 +190,7 @@
       ClassLoader cl = Thread.currentThread().getContextClassLoader();
       InputStream is = cl.getResourceAsStream(orbPropertiesFileName);
       props.load(is);
+      
       String oaiAddr = props.getProperty("OAIAddr");
       if (oaiAddr == null)
          oaiAddr = ServerConfigUtil.getSpecificBindAddress();
@@ -398,7 +401,7 @@
          unbind(IR_POA_NAME);
 
          // Stop ORB
-         orb.shutdown(false);
+         orb.shutdown(gracefulShutdown);
          
          // Unbind SSL domain
          Registry.unbind(SSL_DOMAIN);
@@ -439,6 +442,13 @@
       this.orbSingletonClass = orbSingletonClass;
    }
 
+   public void setORBGracefulShutdown(boolean value){
+	   this.gracefulShutdown = value;
+   }
+   public boolean getORBGracefulShutdown(){
+	   return this.gracefulShutdown;
+   }
+   
    public String getORBSingletonDelegate()
    {
       return orbSingletonDelegate;

Modified: branches/JBPAPP_5_1_0_Final_JBPAPP-5820/iiop/src/main/org/jboss/iiop/CorbaORBServiceMBean.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5820/iiop/src/main/org/jboss/iiop/CorbaORBServiceMBean.java	2011-01-26 09:58:01 UTC (rev 110448)
+++ branches/JBPAPP_5_1_0_Final_JBPAPP-5820/iiop/src/main/org/jboss/iiop/CorbaORBServiceMBean.java	2011-01-26 11:52:29 UTC (rev 110449)
@@ -75,5 +75,9 @@
 
    boolean getSunJDK14IsLocalBugFix();
    void setSunJDK14IsLocalBugFix(boolean sunJDK14IsLocalBugFix);
+   
+   public void setORBGracefulShutdown(boolean value);
+   public boolean getORBGracefulShutdown();
+   
 }