svn commit: r497948 - in /webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl: Messages.properties SimpleServiceGroup.java

[da...@apache.org]

Author: danj
Date: Fri Jan 19 12:39:45 2007
New Revision: 497948

URL: http://svn.apache.org/viewvc?view=rev&rev=497948
Log:
removed call to shutdown() when Add() request is invalid - resource was not initialized, so no shutdown needed.

Modified:
    webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/Messages.properties
    webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/SimpleServiceGroup.java

Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/Messages.properties
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/Messages.properties?view=diff&rev=497948&r1=497947&r2=497948
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/Messages.properties (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/Messages.properties Fri Jan 19 12:39:45 2007
@@ -13,5 +13,4 @@
 NullDocument=The DOM Document to be used as an Element factory is null.
 NullEntry=The entry resource is null.
 NoServiceGroupCapability=The resource with context path 'XXX' is using the WS-SG ServiceGroupRegistration capability but not the WS-SG ServiceGroup capability. You can't do service group registration without basic service group capabilities, so make sure this capability is added. The capability URI is 'XXX'.
-EntryShutdownFailed=The WS-SG Entry resource could not be shutdown. The shutdown was started because the WS-SG request was found to be invalid. The original error was: XXX.
 NoWSRL=The WS-SG Entry resources, which have context path 'XXX', do not support the WS-RL ScheduledTermination capability. WS-SG Add requests that specify an initial termination time for WS-SG entries will only work if the WS-SG resource type defined in muse.xml has the WS-RL ScheduledTermination capability, defined by capability URI 'XXX'.

Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/SimpleServiceGroup.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/SimpleServiceGroup.java?view=diff&rev=497948&r1=497947&r2=497948
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/SimpleServiceGroup.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/SimpleServiceGroup.java Fri Jan 19 12:39:45 2007
@@ -135,27 +135,13 @@
         
         //
         // make sure the entry resource can process termination time, if 
-        // one exists. if it can't, the request was invalid and we need 
-        // to destroy the entry resource 
+        // one exists. if it can't, the request was invalid.
+        //
+        // NOTE: we do NOT shutdown() the resource because it has not 
+        //       been initialize()d yet.        
         //
         if (termination != null && !resource.hasCapability(WsrlConstants.SCHEDULED_TERMINATION_URI))
         {
-            try
-            {
-                resource.shutdown();
-            }
-            
-            catch (SoapFault fault)
-            {
-                //
-                // we still have to throw the proper WSRF fault, so we can't 
-                // stop here - just log it and give a warning as to why we 
-                // didn't halt the request immediately
-                //
-                LoggingUtils.logError(getLog(), fault);
-                getLog().info(_MESSAGES.get("EntryShutdownFailed", new Object[]{ fault.getMessage() }));
-            }
-            
             Object[] filler = { endpoint, WsrlConstants.SCHEDULED_TERMINATION_URI };
             throw new AddRefusedFault(_MESSAGES.get("NoWSRL", filler));
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org