You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/10/06 18:56:01 UTC
svn commit: r822344 - in
/tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi:
DefaultRMIHost.java DefaultRMIHostExtensionPoint.java
Author: rfeng
Date: Tue Oct 6 16:56:01 2009
New Revision: 822344
URL: http://svn.apache.org/viewvc?rev=822344&view=rev
Log:
Create RMI Registry before checking its existence
Modified:
tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
Modified: tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java?rev=822344&r1=822343&r2=822344&view=diff
==============================================================================
--- tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java (original)
+++ tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java Tue Oct 6 16:56:01 2009
@@ -61,14 +61,10 @@
registry = rmiRegistries.get(Integer.toString(rmiURI.port));
if (registry == null) {
try {
- registry = LocateRegistry.getRegistry(null, rmiURI.port, socketFactory);
- // FIXME: It takes about 15 seconds to time out
- registry.lookup(rmiURI.serviceName);
- } catch (RemoteException e) {
registry = LocateRegistry.createRegistry(rmiURI.port, socketFactory, socketFactory);
- } catch (NotBoundException e) {
- // Ignore
- }
+ } catch (RemoteException e) {
+ registry = LocateRegistry.getRegistry(null, rmiURI.port, socketFactory);
+ }
rmiRegistries.put(Integer.toString(rmiURI.port), registry);
}
registry.bind(rmiURI.serviceName, serviceObject);
Modified: tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java?rev=822344&r1=822343&r2=822344&view=diff
==============================================================================
--- tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java (original)
+++ tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java Tue Oct 6 16:56:01 2009
@@ -34,7 +34,6 @@
private List<RMIHost> rmiHosts = new ArrayList<RMIHost>();
public DefaultRMIHostExtensionPoint() {
- addRMIHost(new DefaultRMIHost());
}
public void addRMIHost(RMIHost rmiHost) {
@@ -48,7 +47,10 @@
rmiHosts.remove(rmiHost);
}
- public List<RMIHost> getRMIHosts() {
+ public synchronized List<RMIHost> getRMIHosts() {
+ if(rmiHosts.isEmpty()) {
+ addRMIHost(new DefaultRMIHost());
+ }
return rmiHosts;
}