cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1154234 - in /cxf/branches/2.4.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java
Date Fri, 05 Aug 2011 14:19:55 GMT
Author: sergeyb
Date: Fri Aug  5 14:19:55 2011
New Revision: 1154234

URL: http://svn.apache.org/viewvc?rev=1154234&view=rev
Log:
Merged revisions 1154158,1154232 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1154158 | sergeyb | 2011-08-05 11:27:31 +0100 (Fri, 05 Aug 2011) | 1 line
  
  [CXF-3713] Replacing explicit InitialContext calls with reflection code
........
  r1154232 | sergeyb | 2011-08-05 15:15:40 +0100 (Fri, 05 Aug 2011) | 1 line
  
  [CXF-3713] Reverting reflection-based code but retaining Throwable catch
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug  5 14:19:55 2011
@@ -1 +1 @@
-/cxf/trunk:1154143,1154149
+/cxf/trunk:1154143,1154149,1154158,1154232

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java?rev=1154234&r1=1154233&r2=1154234&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java
Fri Aug  5 14:19:55 2011
@@ -29,10 +29,8 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import javax.servlet.ServletContext;
 
-
 import org.apache.cxf.resource.ResourceResolver;
 
 
@@ -68,7 +66,7 @@ public class ServletContextResourceResol
                     ic.close();
                 }
             }
-        } catch (NamingException e) {
+        } catch (Throwable e) {
             //do nothing
         }
 



Mime
View raw message