[teiid-commits] teiid SVN: r880 - in trunk: embedded/src/main/java/com/metamatrix/jdbc and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: rareddy
Date: 2009-05-07 14:17:30 -0400 (Thu, 07 May 2009)
New Revision: 880

Modified:
   trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMConnection.java
   trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMServerConnection.java
   trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnection.java
Log:
TEIID-564: since the abstract method spans different class loaders in the case of the "embedded", package private will not work.

Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMConnection.java
===================================================================
--- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMConnection.java	2009-05-07 17:36:49 UTC (rev 879)
+++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMConnection.java	2009-05-07 18:17:30 UTC (rev 880)
@@ -507,7 +507,7 @@
      * Get the database name that this connection is representing 
      * @return String name of the database
      */
-    abstract String getDatabaseName();
+    public abstract String getDatabaseName();
     
     /**
      * Retrieves the current holdability of ResultSet objects created using this Connection object.
@@ -912,7 +912,7 @@
 	
 	public abstract BaseDriver getBaseDriver();
 	
-	abstract boolean isSameProcess(MMConnection conn) throws CommunicationException;
+	public abstract boolean isSameProcess(MMConnection conn) throws CommunicationException;
     
 	//## JDBC4.0-begin ##
 	public void setClientInfo(Properties properties)

Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMServerConnection.java
===================================================================
--- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMServerConnection.java	2009-05-07 17:36:49 UTC (rev 879)
+++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMServerConnection.java	2009-05-07 18:17:30 UTC (rev 880)
@@ -94,7 +94,7 @@
     /** 
      * @see com.metamatrix.jdbc.MMConnection#getDatabaseName()
      */
-    String getDatabaseName() {
+    public String getDatabaseName() {
         return SERVER_NAME;
     }
 
@@ -113,7 +113,7 @@
 	}
 
 	@Override
-	boolean isSameProcess(MMConnection conn) throws CommunicationException {
+	public boolean isSameProcess(MMConnection conn) throws CommunicationException {
 		if (conn instanceof MMServerConnection
 				&& this.serverConn instanceof SocketServerConnection
 				&& conn.serverConn instanceof SocketServerConnection) {

Modified: trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnection.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnection.java	2009-05-07 17:36:49 UTC (rev 879)
+++ trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnection.java	2009-05-07 18:17:30 UTC (rev 880)
@@ -114,7 +114,7 @@
      * @see com.metamatrix.jdbc.MMConnection#getDatabaseName()
      */
     @Override
-    String getDatabaseName() {
+    public String getDatabaseName() {
         return SERVER_NAME;
     }
 
@@ -124,7 +124,7 @@
 	}
 
 	@Override
-	boolean isSameProcess(MMConnection conn) {
+	public boolean isSameProcess(MMConnection conn) {
 		return (conn instanceof EmbeddedConnection);
 	}