root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

SPR-7137 

+ fixed incorrect message when unregistering services from passed in registries
This commit is contained in:
Costin Leau 2010-04-29 14:42:24 +00:00
parent c1f18582e7
commit 159f98728e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.springframework.context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java
View File

@ -92,6 +92,8 @@ public class RmiServiceExporter extends RmiBasedExporter implements Initializing
private Remote exportedObject; private Remote exportedObject;
private boolean createdRegistry = false;
/** /**
* Set the name of the exported RMI service, * Set the name of the exported RMI service,
@ -258,10 +260,13 @@ public class RmiServiceExporter extends RmiBasedExporter implements Initializing
"RMIServerSocketFactory without RMIClientSocketFactory for registry not supported"); "RMIServerSocketFactory without RMIClientSocketFactory for registry not supported");
} }
this.createdRegistry = false;
// Determine RMI registry to use. // Determine RMI registry to use.
if (this.registry == null) { if (this.registry == null) {
this.registry = getRegistry(this.registryHost, this.registryPort, this.registry = getRegistry(this.registryHost, this.registryPort,
this.registryClientSocketFactory, this.registryServerSocketFactory); this.registryClientSocketFactory, this.registryServerSocketFactory);
this.createdRegistry = true;
} }
// Initialize and cache exported object. // Initialize and cache exported object.
@ -318,7 +323,7 @@ public class RmiServiceExporter extends RmiBasedExporter implements Initializing
throws RemoteException { throws RemoteException {
if (registryHost != null) { if (registryHost != null) {
// Host explictly specified: only lookup possible. // Host explicitly specified: only lookup possible.
if (logger.isInfoEnabled()) { if (logger.isInfoEnabled()) {
logger.info("Looking for RMI registry at port '" + registryPort + "' of host [" + registryHost + "]"); logger.info("Looking for RMI registry at port '" + registryPort + "' of host [" + registryHost + "]");
} }
@ -422,15 +427,15 @@ public class RmiServiceExporter extends RmiBasedExporter implements Initializing
public void destroy() throws RemoteException { public void destroy() throws RemoteException {
if (logger.isInfoEnabled()) { if (logger.isInfoEnabled()) {
logger.info("Unbinding RMI service '" + this.serviceName + logger.info("Unbinding RMI service '" + this.serviceName +
"' from registry at port '" + this.registryPort + "'"); "' from registry" + (this.createdRegistry ? (" at port '" + this.registryPort + "'") : ""));
} }
try { try {
this.registry.unbind(this.serviceName); this.registry.unbind(this.serviceName);
} }
catch (NotBoundException ex) { catch (NotBoundException ex) {
if (logger.isWarnEnabled()) { if (logger.isWarnEnabled()) {
logger.warn("RMI service '" + this.serviceName + "' is not bound to registry at port '" + logger.warn("RMI service '" + this.serviceName + "' is not bound to registry"
this.registryPort + "' anymore", ex); + (this.createdRegistry ? (" at port '" + this.registryPort + "' anymore") : ""), ex);
} }
} }
finally { finally {
@ -451,5 +456,4 @@ public class RmiServiceExporter extends RmiBasedExporter implements Initializing
} }
} }
} }
} }