portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r751876 - /portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/events/EventCoordinationServiceImpl.java
Date Mon, 09 Mar 2009 22:17:54 GMT
Author: taylor
Date: Mon Mar  9 22:17:54 2009
New Revision: 751876

URL: http://svn.apache.org/viewvc?rev=751876&view=rev
Log:
minor tweaks to excepton handling

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/events/EventCoordinationServiceImpl.java

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/events/EventCoordinationServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/events/EventCoordinationServiceImpl.java?rev=751876&r1=751875&r2=751876&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/events/EventCoordinationServiceImpl.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/events/EventCoordinationServiceImpl.java
Mon Mar  9 22:17:54 2009
@@ -339,6 +339,13 @@
                     log.error("Failed to stream for de-serialization: " + value, e);
                     xml = null;
                 }
+                finally
+                {
+                    if (xml == null)
+                    {
+                        Thread.currentThread().setContextClassLoader(savedLoader);
+                    }
+                }                
             }           
             if (xml != null) 
             {
@@ -355,10 +362,12 @@
                     log.error("Failed to de-serializee: " + value, e);
                     xml = null;
                 }
-
+                finally
+                {
+                    Thread.currentThread().setContextClassLoader(savedLoader);          
                 
+                }
             }
         }
-        Thread.currentThread().setContextClassLoader(savedLoader);        
         return deserializedValue;
     }
     



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message