Merge pull request mybatis#442 from mybatis/revert-439-issues/437_pol…

…ishing Revert "mybatis#437: Polishing some logics and comments"
roddricky · Jul 16, 2015 · 4eb30ef · 4eb30ef
2 parents 093aa86 + 2543a46
commit 4eb30ef
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 22 deletions.
diff --git a/src/main/java/org/apache/ibatis/binding/MapperMethod.java b/src/main/java/org/apache/ibatis/binding/MapperMethod.java
@@ -35,7 +35,6 @@
  * @author Clinton Begin
  * @author Eduardo Macarron
  * @author Lasse Voss
- * @author Kazuki Shimizu
  */
 public class MapperMethod {
 
@@ -246,7 +245,7 @@ public MethodSignature(Configuration configuration, Method method) {
       this.returnType = method.getReturnType();
       this.returnsVoid = void.class.equals(this.returnType);
       this.returnsMany = (configuration.getObjectFactory().isCollection(this.returnType) || this.returnType.isArray());
-      this.returnsCursor = Cursor.class.isAssignableFrom(this.returnType);
+      this.returnsCursor = Cursor.class.equals(this.returnType);
       this.mapKey = getMapKey(method);
       this.returnsMap = (this.mapKey != null);
       this.hasNamedParameters = hasNamedParams(method);

diff --git a/src/main/java/org/apache/ibatis/cursor/defaults/DefaultCursor.java b/src/main/java/org/apache/ibatis/cursor/defaults/DefaultCursor.java
@@ -16,8 +16,6 @@
 package org.apache.ibatis.cursor.defaults;
 
 import org.apache.ibatis.cursor.Cursor;
-import org.apache.ibatis.exceptions.ExceptionFactory;
-import org.apache.ibatis.executor.ErrorContext;
 import org.apache.ibatis.executor.resultset.DefaultResultSetHandler;
 import org.apache.ibatis.executor.resultset.ResultSetWrapper;
 import org.apache.ibatis.mapping.ResultMap;
@@ -33,7 +31,6 @@
 
 /**
  * @author Guillaume Darmont / [email protected]
- * @author Kazuki Shimizu
  */
 public class DefaultCursor<T> implements Cursor<T> {
 
@@ -114,7 +111,7 @@ protected T fetchNextObjectFromDatabase() {
             opened = true;
             resultSetHandler.handleRowValues(rsw, resultMap, objectWrapperResultHandler, RowBounds.DEFAULT, null);
         } catch (SQLException e) {
-            ExceptionFactory.wrapException("Error fetching next object from database at the DefaultCursor.", e);
+            throw new RuntimeException(e);
         }
 
         T next = objectWrapperResultHandler.result;
@@ -163,11 +160,7 @@ public CursorIterator() {
         @Override
         public boolean hasNext() {
             if (object == null) {
-                try {
-                    object = fetchNextUsingRowBound();
-                } finally {
-                    ErrorContext.instance().reset();
-                }
+                object = fetchNextUsingRowBound();
             }
             return object != null;
         }
@@ -178,11 +171,7 @@ public T next() {
             T next = object;
 
             if (next == null) {
-                try {
-                    next = fetchNextUsingRowBound();
-                } finally {
-                    ErrorContext.instance().reset();
-                }
+                next = fetchNextUsingRowBound();
             }
 
             if (next != null) {

diff --git a/src/test/java/org/apache/ibatis/submitted/cursor_nested/CreateDB.sql b/src/test/java/org/apache/ibatis/submitted/cursor_nested/CreateDB.sql
@@ -1,6 +1,6 @@
 
 --
---    Copyright 2009-2015 The MyBatis Team
+--    Copyright 2009-2012 The MyBatis Team
 --
 --    Licensed under the Apache License, Version 2.0 (the "License");
 --    you may not use this file except in compliance with the License.

diff --git a/src/test/java/org/apache/ibatis/submitted/cursor_nested/Mapper.xml b/src/test/java/org/apache/ibatis/submitted/cursor_nested/Mapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-       Copyright 2009-2015 The MyBatis Team
+       Copyright 2009-2012 The MyBatis Team
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.

diff --git a/src/test/java/org/apache/ibatis/submitted/cursor_nested/mybatis-config.xml b/src/test/java/org/apache/ibatis/submitted/cursor_nested/mybatis-config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
-       Copyright 2009-2015 The MyBatis Team
+       Copyright 2009-2012 The MyBatis Team
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.

diff --git a/src/test/java/org/apache/ibatis/submitted/cursor_simple/CreateDB.sql b/src/test/java/org/apache/ibatis/submitted/cursor_simple/CreateDB.sql
@@ -1,5 +1,5 @@
 --
---    Copyright 2009-2015 The MyBatis Team
+--    Copyright 2009-2012 The MyBatis Team
 --
 --    Licensed under the Apache License, Version 2.0 (the "License");
 --    you may not use this file except in compliance with the License.

diff --git a/src/test/java/org/apache/ibatis/submitted/cursor_simple/Mapper.xml b/src/test/java/org/apache/ibatis/submitted/cursor_simple/Mapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-       Copyright 2009-2015 The MyBatis Team
+       Copyright 2009-2012 The MyBatis Team
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.

diff --git a/src/test/java/org/apache/ibatis/submitted/cursor_simple/mybatis-config.xml b/src/test/java/org/apache/ibatis/submitted/cursor_simple/mybatis-config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
-       Copyright 2009-2015 The MyBatis Team
+       Copyright 2009-2012 The MyBatis Team
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.