Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 96E63DC60 for ; Wed, 28 Nov 2012 16:15:36 +0000 (UTC) Received: (qmail 60143 invoked by uid 500); 28 Nov 2012 16:15:36 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 59914 invoked by uid 500); 28 Nov 2012 16:15:31 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 59903 invoked by uid 99); 28 Nov 2012 16:15:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Nov 2012 16:15:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Nov 2012 16:15:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C09BF23888CD; Wed, 28 Nov 2012 16:15:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1414782 - /jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RmiRepositoryFactory.java Date: Wed, 28 Nov 2012 16:15:06 -0000 To: commits@jackrabbit.apache.org From: alexparvulescu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121128161506.C09BF23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: alexparvulescu Date: Wed Nov 28 16:15:05 2012 New Revision: 1414782 URL: http://svn.apache.org/viewvc?rev=1414782&view=rev Log: JCR-3459 RmiRepositoryFactory regression, invalid stream header Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RmiRepositoryFactory.java Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RmiRepositoryFactory.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RmiRepositoryFactory.java?rev=1414782&r1=1414781&r2=1414782&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RmiRepositoryFactory.java (original) +++ jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/repository/RmiRepositoryFactory.java Wed Nov 28 16:15:05 2012 @@ -80,6 +80,18 @@ public class RmiRepositoryFactory implem return new SafeClientRepositoryUrl(url, new ClientAdapterFactory()); } + @SuppressWarnings("rawtypes") + private Repository getJndiRepository(final String name, + final Hashtable environment) throws RepositoryException { + return new SafeClientRepositoryJndi(name, environment, + new ClientAdapterFactory()); + } + + private Repository getRmiRepository(final String name) + throws RepositoryException { + return new SafeClientRepositoryName(name, new ClientAdapterFactory()); + } + private static class SafeClientRepositoryUrl extends SafeClientRepository { private final URL url; @@ -115,55 +127,63 @@ public class RmiRepositoryFactory implem } @SuppressWarnings("rawtypes") - private Repository getJndiRepository(final String name, final Hashtable environment) - throws RepositoryException { - return new SafeClientRepository(new ClientAdapterFactory()) { - - @Override - protected RemoteRepository getRemoteRepository() throws RemoteException { - try { - Object value = new InitialContext(environment).lookup(name); - if (value instanceof RemoteRepository) { - return (RemoteRepository) value; - } else { - throw new RemoteException( - "The JNDI resource " + name - + " is not a remote repository stub: " + value); - } - } catch (NamingException e) { - throw new RemoteException( - "Failed to look up the JNDI resource " + name, e); - } - } - }; + private static class SafeClientRepositoryJndi extends SafeClientRepository { + + private final String name; + private final Hashtable environment; + + public SafeClientRepositoryJndi(String name, Hashtable environment, + LocalAdapterFactory factory) { + super(factory); + this.name = name; + this.environment = environment; + } + + @Override + protected RemoteRepository getRemoteRepository() throws RemoteException { + try { + Object value = new InitialContext(environment).lookup(name); + if (value instanceof RemoteRepository) { + return (RemoteRepository) value; + } else { + throw new RemoteException("The JNDI resource " + name + + " is not a remote repository stub: " + value); + } + } catch (NamingException e) { + throw new RemoteException( + "Failed to look up the JNDI resource " + name, e); + } + } } - private Repository getRmiRepository(final String name) - throws RepositoryException { - return new SafeClientRepository(new ClientAdapterFactory()) { - - @Override - protected RemoteRepository getRemoteRepository() throws RemoteException { - try { - Object value = Naming.lookup(name); - if (value instanceof RemoteRepository) { - return (RemoteRepository) value; - } else { - throw new RemoteException( - "The RMI resource " + name - + " is not a remote repository stub: " + value); - } - } catch (NotBoundException e) { - throw new RemoteException( - "RMI resource " + name + " not found", e); - } catch (MalformedURLException e) { - throw new RemoteException( - "Invalid RMI name: " + name, e); - } catch (RemoteException e) { - throw new RemoteException( - "Failed to look up the RMI resource " + name, e); - } - } - }; + private static class SafeClientRepositoryName extends SafeClientRepository { + + private final String name; + + public SafeClientRepositoryName(String name, LocalAdapterFactory factory) { + super(factory); + this.name = name; + } + + @Override + protected RemoteRepository getRemoteRepository() throws RemoteException { + try { + Object value = Naming.lookup(name); + if (value instanceof RemoteRepository) { + return (RemoteRepository) value; + } else { + throw new RemoteException("The RMI resource " + name + + " is not a remote repository stub: " + value); + } + } catch (NotBoundException e) { + throw new RemoteException( + "RMI resource " + name + " not found", e); + } catch (MalformedURLException e) { + throw new RemoteException("Invalid RMI name: " + name, e); + } catch (RemoteException e) { + throw new RemoteException("Failed to look up the RMI resource " + + name, e); + } + } } }