commit 8a19a366a3e298dc3b2822f694340740d1245dd2
author Eric Anderson <ejona@google.com> Mon Jun 03 17:18:11 2013 -0700
committer Eric Anderson <ejona@google.com> Wed Jun 05 18:02:30 2013 -0700
tree 1d16958fa4c075864d2617baca8116cb7b5ba62e
parent 1fdd83e9c94ee573371276229ab27c87899eaa45

Correct error handling when using cursor paginator

Previously we were catching an XmlProcessingexception around a method
that would never throw such an exception. The catch had been intended
for next().

src/com/google/enterprise/adaptor/sharepoint/SharePointAdaptor.java

diff --git a/src/com/google/enterprise/adaptor/sharepoint/SharePointAdaptor.java b/src/com/google/enterprise/adaptor/sharepoint/SharePointAdaptor.java
index 9e17469..5d73c6b 100644
--- a/src/com/google/enterprise/adaptor/sharepoint/SharePointAdaptor.java
+++ b/src/com/google/enterprise/adaptor/sharepoint/SharePointAdaptor.java
@@ -450,10 +450,13 @@
       CursorPaginator<SPContentDatabase, String> changesPaginator
           = client.getChangesContentDatabase(contentDatabase, changeId,
               isSp2010);
-      SPContentDatabase changes;
       try {
-        while ((changes = changesPaginator.next()) != null) {
+        while (true) {
           try {
+            SPContentDatabase changes = changesPaginator.next();
+            if (changes == null) {
+              break;
+            }
             client.getModifiedDocIds(changes, pusher);
           } catch (XmlProcessingException ex) {
             log.log(Level.WARNING, "Error parsing changes from content "