svn commit: r727395 - /jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/RMIRemoteBindingServlet.java

[ju...@apache.org]

Author: jukka
Date: Wed Dec 17 06:31:55 2008
New Revision: 727395

URL: http://svn.apache.org/viewvc?rev=727395&view=rev
Log:
JCR-1910: RMIRemoteBindingServlet fails to initialize if the RMI registry is not available

Ignore the NotBoundException when unbinding as the desired result has already been achieved.

Modified:
    jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/RMIRemoteBindingServlet.java

Modified: jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/RMIRemoteBindingServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/RMIRemoteBindingServlet.java?rev=727395&r1=727394&r2=727395&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/RMIRemoteBindingServlet.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/RMIRemoteBindingServlet.java Wed Dec 17 06:31:55 2008
@@ -89,10 +89,10 @@
     public void destroy() {
         try {
             Naming.unbind(url);
+        } catch (NotBoundException e) {
+            // Ignore, perhaps the reference was already manually removed
         } catch (MalformedURLException e) {
             log("Invalid RMI URL: " + url, e);
-        } catch (NotBoundException e) {
-            log("Repository not bound in RMI: " + url, e);
         } catch (RemoteException e) {
             log("Failed to unbind repository from RMI: " + url, e);
         }