[hibernate-commits] Hibernate SVN: r19436 - in core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate: dialect and 3 other directories.

[hibernate-commits at lists.jboss.org]

Author: stliu
Date: 2010-05-10 04:01:36 -0400 (Mon, 10 May 2010)
New Revision: 19436

Modified:
   core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/util/BasicClassFilter.java
   core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java
   core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
   core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
   core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/secure/JACCPermissions.java
   core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/ArrayHelper.java
Log:
JBPAPP-4256 use System.arraycopy to copy arrays since it is more efficient

Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/util/BasicClassFilter.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/util/BasicClassFilter.java	2010-05-10 05:33:40 UTC (rev 19435)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/util/BasicClassFilter.java	2010-05-10 08:01:36 UTC (rev 19436)
@@ -62,12 +62,7 @@
 		else if ( includedClassNames.contains( className ) ) {
 			return true;
 		}
-		else if ( isInIncludedPackage( className ) ) {
-			return true;
-		}
-		else {
-			return false;
-		}
+		return isInIncludedPackage( className );
 	}
 
 	private boolean isInIncludedPackage(String className) {

Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java	2010-05-10 05:33:40 UTC (rev 19435)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java	2010-05-10 08:01:36 UTC (rev 19436)
@@ -299,18 +299,18 @@
 	};
 
 	// not final-static to avoid possible classcast exceptions if using different oracle drivers.
-	int oracletypes_cursor_value = 0; 
+	int oracletypesCursorValue = 0; 
 	public int registerResultSetOutParameter(java.sql.CallableStatement statement,int col) throws SQLException {
-		if(oracletypes_cursor_value==0) {
+		if(oracletypesCursorValue==0) {
 			try {
 				Class types = ReflectHelper.classForName("oracle.jdbc.driver.OracleTypes");
-				oracletypes_cursor_value = types.getField("CURSOR").getInt(types.newInstance());
+				oracletypesCursorValue = types.getField("CURSOR").getInt(types.newInstance());
 			} catch (Exception se) {
 				throw new HibernateException("Problem while trying to load or access OracleTypes.CURSOR value",se);
 			} 
 		}
 		//	register the type of the out param - an Oracle specific type
-		statement.registerOutParameter(col, oracletypes_cursor_value);
+		statement.registerOutParameter(col, oracletypesCursorValue);
 		col++;
 		return col;
 	}

Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java	2010-05-10 05:33:40 UTC (rev 19435)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java	2010-05-10 08:01:36 UTC (rev 19436)
@@ -335,9 +335,10 @@
 		}
 		String[] result = new String[getTableSpan()];
 		result[0] = sqlLazyUpdateByRowIdString;
-		for ( int i = 1; i < getTableSpan(); i++ ) {
-			result[i] = sqlLazyUpdateStrings[i];
-		}
+//		for ( int i = 1; i < getTableSpan(); i++ ) {
+//			result[i] = sqlLazyUpdateStrings[i];
+//		}
+		System.arraycopy( sqlLazyUpdateStrings, 1, result, 1, getTableSpan() );
 		return result;
 	}
 

Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java	2010-05-10 05:33:40 UTC (rev 19435)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java	2010-05-10 08:01:36 UTC (rev 19436)
@@ -440,9 +440,7 @@
 		for (int i=0; i<len; i++) {
 			temp[i] = objects[len-i-1];
 		}
-		for (int i=0; i<len; i++) {
-			objects[i] = temp[i];
-		}
+		System.arraycopy( temp, 0, objects, 0, len );
 	}
 
 	private static final String[] reverse(String[] objects) {

Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/secure/JACCPermissions.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/secure/JACCPermissions.java	2010-05-10 05:33:40 UTC (rev 19435)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/secure/JACCPermissions.java	2010-05-10 08:01:36 UTC (rev 19436)
@@ -67,7 +67,7 @@
 			}
 
 			ProtectionDomain pd = new ProtectionDomain( ejbCS, null, null, principals );
-			if ( policy.implies( pd, methodPerm ) == false ) {
+			if ( !policy.implies( pd, methodPerm ) ) {
 				String msg = "Denied: " + methodPerm + ", caller=" + caller;
 				SecurityException e = new SecurityException( msg );
 				throw e;

Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/ArrayHelper.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/ArrayHelper.java	2010-05-10 05:33:40 UTC (rev 19435)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/ArrayHelper.java	2010-05-10 08:01:36 UTC (rev 19436)
@@ -136,17 +136,13 @@
 
 	public static String[] slice(String[] strings, int begin, int length) {
 		String[] result = new String[length];
-		for ( int i=0; i<length; i++ ) {
-			result[i] = strings[begin+i];
-		}
+		System.arraycopy( strings, begin, result, 0, length );
 		return result;
 	}
 
 	public static Object[] slice(Object[] objects, int begin, int length) {
 		Object[] result = new Object[length];
-		for ( int i=0; i<length; i++ ) {
-			result[i] = objects[begin+i];
-		}
+		System.arraycopy( objects, begin, result, 0, length );
 		return result;
 	}