svn commit: r383595 - in /db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc: EmbedConnection.java TransactionResourceImpl.java

[dj...@apache.org]

Author: djd
Date: Mon Mar  6 09:38:39 2006
New Revision: 383595

URL: http://svn.apache.org/viewcvs?rev=383595&view=rev
Log:
DERBY-467 Reduce the visibility of some methods in classes for EmbedConnection.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java?rev=383595&r1=383594&r2=383595&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java Mon Mar  6 09:38:39 2006
@@ -944,7 +944,7 @@
 	//
 	// NOTE: This method is not part of JDBC specs.
 	//
-    private void close(Exception e) throws SQLException {
+    private void close(StandardException e) throws SQLException {
 		
 		synchronized(getConnectionSynchronization())
 		{
@@ -1287,7 +1287,7 @@
 
 	//EmbedConnection30 overrides this method so it can release the savepoints array if
 	//the exception severity is transaction level
-	public SQLException handleException(Throwable thrownException)
+	SQLException handleException(Throwable thrownException)
 			throws SQLException
 	{
 		/*

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java?rev=383595&r1=383594&r2=383595&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java Mon Mar  6 09:38:39 2006
@@ -232,12 +232,12 @@
 	 * XAResource, which uses the xa_commit or xa_rollback interface as a 
 	 * safeguard. 
 	 */
-	protected void commit() throws StandardException
+	void commit() throws StandardException
 	{
 		lcc.userCommit();
 	}		
 
-	protected void rollback() throws StandardException
+	void rollback() throws StandardException
 	{
 		// lcc may be null if this is called in close.
 		if (lcc != null)
@@ -260,12 +260,12 @@
 	/**
 	 * Resolve: probably superfluous
 	 */
-	protected void clearLcc()
+	void clearLcc()
 	{
 		lcc = null;
 	}
 
-	protected final void setupContextStack()
+	final void setupContextStack()
 	{
 		if (SanityManager.DEBUG) {
 			SanityManager.ASSERT(cm != null, "setting up null context manager stack");
@@ -274,7 +274,7 @@
 			csf.setCurrentContextManager(cm);
 	}
 
-	protected final void restoreContextStack() {
+	final void restoreContextStack() {
 
 		if ((csf == null) || (cm == null))
 			return;
@@ -288,7 +288,7 @@
 	/*
 	 * clean up the error and wrap the real exception in some SQLException.
 	 */
-	protected final SQLException handleException(Throwable thrownException,
+	final SQLException handleException(Throwable thrownException,
 									   boolean autoCommit,	
 									   boolean rollbackOnAutoCommit)
 			throws SQLException 
@@ -415,7 +415,7 @@
 		return  username;
 	}
 
-	public boolean cleanupOnError(Throwable e)
+	boolean cleanupOnError(Throwable e)
 	{
 		if (SanityManager.DEBUG)
 			SanityManager.ASSERT(cm != null, "cannot cleanup on error with null context manager");
@@ -423,7 +423,7 @@
 		return cm.cleanupOnError(e);
 	}
 
-	public boolean isIdle()
+	boolean isIdle()
 	{
 		// If no lcc, there is no transaction.
 		return (lcc == null || lcc.getTransactionExecute().isIdle());