Author: kwright
Date: Tue Sep 12 17:30:50 2017
New Revision: 1808138
URL: http://svn.apache.org/viewvc?rev=1808138&view=rev
Log:
Tentative fix for CONNECTORS-1456.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/Configuration.java
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1808138&r1=1808137&r2=1808138&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue Sep 12 17:30:50 2017
@@ -3,6 +3,10 @@ $Id$
======================= 2.9-dev =====================
+CONNECTORS-1456: Tentative fix for API issue exporting jobs in JSON
+format. Basically, simple valued array elements did not work.
+(Adrian Conlon, Karl Wright)
+
CONNECTORS-1455: Eventually skip a locked shared drive file, rather
than aborting the job.
(Julien Massiera, Karl Wright)
Modified:
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/Configuration.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/Configuration.java?rev=1808138&r1=1808137&r2=1808138&view=diff
==============================================================================
---
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/Configuration.java
(original)
+++
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/Configuration.java
Tue Sep 12 17:30:50 2017
@@ -794,7 +794,13 @@ public class Configuration implements IH
}
public void value(final String value) {
- currentObject.put(currentKey, value);
+ if (currentKey != null) {
+ currentObject.put(currentKey, value);
+ } else if (currentArray != null) {
+ currentArray.add(value);
+ } else {
+ throw new RuntimeException("Naked value found with no context!");
+ }
}
public void endObject() {
