[teiid-commits] teiid SVN: r4444 - trunk/jboss-integration/src/main/java/org/teiid/jboss.
Author: rareddy
Date: 2012-09-14 11:30:26 -0400 (Fri, 14 Sep 2012)
New Revision: 4444
Modified:
trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportService.java
Log:
TEIID-2204: I believe during the reload the naming store was being accessed before the it
got started; treated any error out of nameing store as not available. Also, ODBC socket
was not being properly closed. Corrected that issue.
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java 2012-09-14
15:01:26 UTC (rev 4443)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java 2012-09-14
15:30:26 UTC (rev 4444)
@@ -216,7 +216,7 @@
InitialContext ic = new InitialContext();
ic.lookup(LocalServerConnection.TEIID_RUNTIME_CONTEXT);
return true;
- } catch (NamingException e) {
+ } catch (Throwable e) {
return false;
}
}
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportService.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportService.java 2012-09-14
15:01:26 UTC (rev 4443)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportService.java 2012-09-14
15:30:26 UTC (rev 4444)
@@ -163,6 +163,7 @@
getVdbRepository().odbcEnabled();
ODBCSocketListener odbc = new ODBCSocketListener(address, this.socketConfig,
this.csr, getBufferManagerInjector().getValue(), getMaxODBCLobSizeAllowed(), this.logon);
odbc.setAuthenticationType(this.sessionService.getAuthenticationType());
+ this.socketListener = odbc;
LogManager.logInfo(LogConstants.CTX_RUNTIME,
IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50037, address.getHostName(),
String.valueOf(address.getPort()), (sslEnabled?"ON":"OFF"),
authenticationDomains)); //$NON-NLS-1$ //$NON-NLS-2$
}
else {