[Joafip-svn] SF.net SVN: joafip:[2934] trunk/joafip/src

[<luc...@us...>]

Revision: 2934
          http://joafip.svn.sourceforge.net/joafip/?rev=2934&view=rev
Author:   luc_peuvrier
Date:     2011-10-21 03:10:06 +0000 (Fri, 21 Oct 2011)
Log Message:
-----------
tests ok

Modified Paths:
--------------
    trunk/joafip/src/main/java/net/sf/joafip/store/service/proxy/ProxyCallBack.java
    trunk/joafip/src/main/java/net/sf/joafip/store/service/proxy/ProxyManager2.java
    trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestSaveInExclusiveDataAccessSession.java
    trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/TestProxyAutoSave.java

Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/proxy/ProxyCallBack.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/proxy/ProxyCallBack.java	2011-10-21 01:40:53 UTC (rev 2933)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/proxy/ProxyCallBack.java	2011-10-21 03:10:06 UTC (rev 2934)
@@ -176,28 +176,28 @@
 	}
 
 	// FIXMELUC _________________________for test
-//	private boolean in() {
-//		final StackTraceElement[] stackTraceElements = new Exception()
-//				.getStackTrace();
-//		final StackTraceElement stackTraceElement = stackTraceElements[3];
-//		final String className = stackTraceElement.getClassName();
-//		final String methodName = stackTraceElement.getMethodName();
-//		return className.contains("MultiMap")
-//				&& methodName.contains("addKeyDefinition");
-//	}
+	// private boolean in() {
+	// final StackTraceElement[] stackTraceElements = new Exception()
+	// .getStackTrace();
+	// final StackTraceElement stackTraceElement = stackTraceElements[3];
+	// final String className = stackTraceElement.getClassName();
+	// final String methodName = stackTraceElement.getMethodName();
+	// return className.contains("MultiMap")
+	// && methodName.contains("addKeyDefinition");
+	// }
 
 	@Override
 	@SuppressWarnings("PMD")
 	public void intercept$JOAFIP$() {
 		synchronized (storeMutex) {
-			if (autoSaveEnabled) {
+			if (exclusiveAccessSession) {
 				inObjectCount++;
 			}
 			// FIXMELUC _________________________for test
-//			if (in()) {
-//				System.out.println("intercept " + inObjectCount + " "
-//						+ proxyObjectAndPersistInfo);
-//			}
+			// if (in()) {
+			// System.out.println("intercept " + inObjectCount + " "
+			// + proxyObjectAndPersistInfo);
+			// }
 			// end for test
 			if (exclusiveAccessSession) {
 				try {
@@ -251,17 +251,17 @@
 	@SuppressWarnings("PMD")
 	public void methodEnd$JOAFIP$() {
 		// FIXMELUC _________________________for test
-//		if (in()) {
-//			System.out.println("methodEnd " + inObjectCount + " "
-//					+ proxyObjectAndPersistInfo);
-//		}
+		// if (in()) {
+		// System.out.println("methodEnd " + inObjectCount + " "
+		// + proxyObjectAndPersistInfo);
+		// }
 		// end for test
 		synchronized (storeMutex) {
+			final ObjectAndPersistInfo instanceAndPersistInfo = getInstance$JOAFIP$();
+			if (--inObjectCount == 0) {
+				instanceAndPersistInfo.acceded = false;
+			}
 			if (autoSaveEnabled) {
-				final ObjectAndPersistInfo instanceAndPersistInfo = getInstance$JOAFIP$();
-				if (--inObjectCount == 0) {
-					instanceAndPersistInfo.acceded = false;
-				}
 				// ASSERTX
 				assert inObjectCount >= 0 : "running in object count can not be negative, is "
 						+ inObjectCount

Modified: trunk/joafip/src/main/java/net/sf/joafip/store/service/proxy/ProxyManager2.java
===================================================================
--- trunk/joafip/src/main/java/net/sf/joafip/store/service/proxy/ProxyManager2.java	2011-10-21 01:40:53 UTC (rev 2933)
+++ trunk/joafip/src/main/java/net/sf/joafip/store/service/proxy/ProxyManager2.java	2011-10-21 03:10:06 UTC (rev 2934)
@@ -117,7 +117,7 @@
 			} else {
 				final Class<?> enhancedClass = classEnhancer.enhanceClass(
 						objectClassInfo, persistenceId,
-						objectIOManager.isAutoSaveEnabled());
+						objectIOManager.isExclusiveAccessSession());
 				instanceCreated = helperReflect
 						.newInstanceNoConstruction(enhancedClass);
 			}
@@ -155,7 +155,7 @@
 			} else {
 				final Class<?> enhancedClass = classEnhancer.enhanceClass(
 						objectClassInfo, persistenceId,
-						objectIOManager.isAutoSaveEnabled());
+						objectIOManager.isExclusiveAccessSession());
 				instanceCreated = reflectNewInstanceDefaultConstructor(enhancedClass);
 			}
 			if (createEntryinObjectMap) {
@@ -199,7 +199,7 @@
 			} else {
 				final Class<?> enhancedClass = classEnhancer.enhanceClass(
 						objectClassInfo, persistenceId,
-						objectIOManager.isAutoSaveEnabled());
+						objectIOManager.isExclusiveAccessSession());
 				instanceCreated = reflectNewInstanceConstruct(enhancedClass,
 						parameterTypes, initargs);
 			}

Modified: trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestSaveInExclusiveDataAccessSession.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestSaveInExclusiveDataAccessSession.java	2011-10-21 01:40:53 UTC (rev 2933)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestSaveInExclusiveDataAccessSession.java	2011-10-21 03:10:06 UTC (rev 2934)
@@ -96,9 +96,6 @@
 		super.setUp();
 		classInfoFactory = new ClassInfoFactory(1);
 		helperReflect = HelperReflect.getInstance();
-		// filePersistence = new FilePersistence(1, null, path,
-		// /**/true/* remove files */,
-		// /**/false/* do not manage garbage */);
 		final FilePersistenceBuilder builder = new FilePersistenceBuilder();
 		builder.setPathName(path.getPath());
 		builder.setProxyMode(true);
@@ -107,7 +104,6 @@
 		builder.setCrashSafeMode(false);
 		filePersistence = (FilePersistence) builder.build();
 		dataAccessSession = filePersistence.createExclusiveDataAccessSession();
-		// useJavaAgent = JoafipJavaAgent.isTransformerInstalled();
 	}
 
 	@Override
@@ -266,7 +262,9 @@
 			}
 		}
 		if (fail) {
-			fail(builder.toString());
+			final String message = builder.toString();
+			logger.error(message);
+			fail(message);
 		}
 	}
 

Modified: trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/TestProxyAutoSave.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/TestProxyAutoSave.java	2011-10-21 01:40:53 UTC (rev 2933)
+++ trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/TestProxyAutoSave.java	2011-10-21 03:10:06 UTC (rev 2934)
@@ -64,8 +64,9 @@
 
 		assertEquals("must not be in object", 0,
 				proxyManager2.getInObjectCount(object));
-		assertEquals("must be in object", 1,
-				((Bob1) object).getInObjectCount(proxyManager2));
+		final int inObjectCount = ((Bob1) object)
+				.getInObjectCount(proxyManager2);
+		assertEquals("must be in object", 1, inObjectCount);
 		assertEquals("must not be in object", 0,
 				proxyManager2.getInObjectCount(object));
 		try {
@@ -84,4 +85,9 @@
 	public boolean isAutoSaveEnabled() { // NOPMD
 		return true;
 	}
+
+	@Override
+	public boolean isExclusiveAccessSession() {
+		return true;
+	}
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.