[teiid-commits] teiid SVN: r3998 - in trunk: client/src/main/java/org/teiid/net and 3 other directories.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2012-04-13 11:01:40 -0400 (Fri, 13 Apr 2012)
New Revision: 3998

Modified:
   trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
   trunk/client/src/main/java/org/teiid/net/ServerConnection.java
   trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java
   trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties
   trunk/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java
Log:
TEIID-1801 adding an exception in the socket case

Modified: trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java	2012-04-12 18:49:45 UTC (rev 3997)
+++ trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java	2012-04-13 15:01:40 UTC (rev 3998)
@@ -406,6 +406,9 @@
         resetExecutionState();
         if (options != null) {
         	if (options.isContinuous()) {
+        		if (!this.driverConnection.getServerConnection().supportsContinuous()) {
+	                throw new TeiidSQLException(JDBCPlugin.Util.getString("JDBC.continuous")); //$NON-NLS-1$
+        		}
         		if (this.getResultSetType() != ResultSet.TYPE_FORWARD_ONLY) {
 	        		String msg = JDBCPlugin.Util.getString("JDBC.forward_only_resultset"); //$NON-NLS-1$
 	                throw new TeiidSQLException(msg);

Modified: trunk/client/src/main/java/org/teiid/net/ServerConnection.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/ServerConnection.java	2012-04-12 18:49:45 UTC (rev 3997)
+++ trunk/client/src/main/java/org/teiid/net/ServerConnection.java	2012-04-13 15:01:40 UTC (rev 3998)
@@ -42,4 +42,6 @@
 	
 	void authenticate() throws ConnectionException, CommunicationException;
 	
+	boolean supportsContinuous();
+	
 }
\ No newline at end of file

Modified: trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java
===================================================================
--- trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java	2012-04-12 18:49:45 UTC (rev 3997)
+++ trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java	2012-04-13 15:01:40 UTC (rev 3998)
@@ -364,4 +364,9 @@
 			}
 		}
 	}
+	
+	@Override
+	public boolean supportsContinuous() {
+		return false;
+	}
 }
\ No newline at end of file

Modified: trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties
===================================================================
--- trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties	2012-04-12 18:49:45 UTC (rev 3997)
+++ trunk/client/src/main/resources/org/teiid/jdbc/i18n.properties	2012-04-13 15:01:40 UTC (rev 3998)
@@ -160,6 +160,7 @@
 system_prop_missing=System property "{0}" missing, please add using -D option on the VM startup script.
 
 JDBC.forward_only_resultset=Continuous queries must be forward only and return a result set.
+JDBC.continuous=Continuous queries are not supported over socket connections.
 module_load_failed=Teiid Embedded mode Driver failed to load. You must only create this type of connection in the same \
 VM as the Teiid Server. Use following driver fragment xml inside the JBoss AS configuration file\
         <drivers>\

Modified: trunk/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java	2012-04-12 18:49:45 UTC (rev 3997)
+++ trunk/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java	2012-04-13 15:01:40 UTC (rev 3998)
@@ -169,4 +169,9 @@
 	public void cleanUp() {
 		
 	}
+	
+	@Override
+	public boolean supportsContinuous() {
+		return true;
+	}
 }