Merge pull request #52 from domaframework/issue-51

LocalTransactionManager#notSupported()でトランザクションを作成しないようにしました fix #51

Author: nakamura-to

src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionManager.java

@@ -200,7 +200,7 @@ protected <RESULT> RESULT notSupportedInternal(
         if (transaction.isActive()) {
             LocalTransactionContext context = transaction.suspend();
             try {
-                return executeInTransaction(isolationLevel, supplier);
+                return supplier.get();
             } finally {
                 transaction.resume(context);
             }

src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionManagerTest.java

@@ -134,4 +134,20 @@ public void testNotSupported_supplier() throws Exception {
         assertEquals("aaa", result);
     }
 
+    public void testNotSupported_in_tx() throws Exception {
+        LocalTransactionManager manager = new LocalTransactionManager(
+                transaction);
+        StringBuilder log = new StringBuilder();
+        log.append(LocalTransactionManagerTest.counter);
+        manager.required(() -> {
+            log.append(LocalTransactionManagerTest.counter);
+            manager.notSupported(() -> {
+                log.append(LocalTransactionManagerTest.counter);
+            });
+            log.append(LocalTransactionManagerTest.counter);
+        });
+        log.append(LocalTransactionManagerTest.counter);
+        assertEquals("01110", log.toString());
+    }
+
 }