10000 Revert "Fixed issue #2388" · githubcs/orientdb@3a1082d · GitHub
[go: up one dir, main page]
Skip to content

Commit 3a1082d

Browse files
lvcalvca
committed
Revert "Fixed issue orientechnologies#2388"
This reverts commit c2a8d96.
1 parent e1bcaa9 commit 3a1082d

File tree

1 file changed

+26
-27
lines changed
  • server/src/main/java/com/orientechnologies/orient/server/network/protocol/http

1 file changed

+26
-27
lines changed

‎server/src/main/java/com/orientechnologies/orient/server/network/protocol/http/OHttpResponse.java

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,29 @@
1515
*/
1616
package com.orientechnologies.orient.server.network.protocol.http;
1717

18+
import com.orientechnologies.common.collection.OMultiValue;
19+
import com.orientechnologies.common.log.OLogManager;
20+
import com.orientechnologies.common.util.OCallable;
21+
import com.orientechnologies.orient.core.db.record.OIdentifiable;
22+
import com.orientechnologies.orient.core.record.ORecord;
23+
import com.orientechnologies.orient.core.record.impl.ODocument;
24+
import com.orientechnologies.orient.core.serialization.OBinaryProtocol;
25+
import com.orientechnologies.orient.core.serialization.serializer.OJSONWriter;
26+
1827
import java.io.ByteArrayInputStream;
1928
import java.io.ByteArrayOutputStream;
2029
import java.io.IOException;
2130
import java.io.InputStream;
2231
import java.io.OutputStream;
2332
import java.io.StringWriter;
2433
import java.util.ArrayList;
25-
import java.util.Collections;
2634
import java.util.Date;
2735
import java.util.Iterator;
2836
import java.util.LinkedHashSet;
2937
import java.util.List;
3038
import java.util.Map;
3139
import java.util.zip.GZIPOutputStream;
3240

33-
import com.orientechnologies.common.collection.OMultiValue;
34-
import com.orientechnologies.common.log.OLogManager;
35-
import com.orientechnologies.common.util.OCallable;
36-
import com.orientechnologies.orient.core.db.record.OIdentifiable;
37-
import com.orientechnologies.orient.core.record.ORecord;
38-
import com.orientechnologies.orient.core.record.impl.ODocument;
39-
import com.orientechnologies.orient.core.serialization.OBinaryProtocol;
40-
import com.orientechnologies.orient.core.serialization.serializer.OJSONWriter;
41-
4241
/**
4342
* Maintains information about current HTTP response.
4443
*
@@ -171,36 +170,36 @@ public void writeResult(Object iResult, final String iFormat, final String accep
171170
if (iResult == null)
172171
send(OHttpUtils.STATUS_OK_NOCONTENT_CODE, "", OHttpUtils.CONTENT_TEXT_PLAIN, null, null, true);
173172
else {
174-
final Object newResult;
175-
if (isJSObject(iResult)) {
176-
newResult = Collections.singleton(new ODocument().field("value", iResult)).iterator();
177-
} else if (iResult instanceof Map<?, ?>) {
178-
newResult = ((Map<?, ?>) iResult).entrySet().iterator();
173+
if (iResult instanceof Map<?, ?>) {
174+
iResult = ((Map<?, ?>) iResult).entrySet().iterator();
179175
} else if (OMultiValue.isMultiValue(iResult)
180176
&& (OMultiValue.getSize(iResult) > 0 && !(OMultiValue.getFirstValue(iResult) instanceof OIdentifiable))) {
181-
newResult = Collections.singleton(new ODocument().field("value", iResult)).iterator();
177+
final List<OIdentifiable> resultSet = new ArrayList<OIdentifiable>();
178+
resultSet.add(new ODocument().field("value", iResult));
179+
iResult = resultSet.iterator();
180+
182181
} else if (iResult instanceof OIdentifiable) {
183182
// CONVERT SIGLE VALUE IN A COLLECTION
184-
newResult = Collections.singleton(iResult).iterator();
183+
final List<OIdentifiable> resultSet = new ArrayList<OIdentifiable>();
184+
resultSet.add((OIdentifiable) iResult);
185+
iResult = resultSet.iterator();
185186
} else if (iResult instanceof Iterable<?>)
186-
newResult = ((Iterable<OIdentifiable>) iResult).iterator();
187+
iResult = ((Iterable<OIdentifiable>) iResult).iterator();
187188
else if (OMultiValue.isMultiValue(iResult))
188-
newResult = OMultiValue.getMultiValueIterator(iResult);
189+
iResult = OMultiValue.getMultiValueIterator(iResult);
189190
else {
190-
newResult = Collections.singleton(new ODocument().field("value", iResult)).iterator();
191+
final List<OIdentifiable> resultSet = new ArrayList<OIdentifiable>();
192+
resultSet.add(new ODocument().field("value", iResult));
193+
iResult = resultSet.iterator();
191194
}
192195

193-
if (newResult == null)
196+
if (iResult == null)
194197
send(OHttpUtils.STATUS_OK_NOCONTENT_CODE, "", OHttpUtils.CONTENT_TEXT_PLAIN, null, null, true);
195-
else
196-
writeRecords(newResult, null, iFormat, accept);
198+
else if (iResult instanceof Iterator<?>)
199+
writeRecords(iResult, null, iFormat, accept);
197200
}
198201
}
199202

200-
private boolean isJSObject(Object iResult) {
201-
return iResult.getCla 5481 ss().getName().equals("jdk.nashorn.api.scripting.ScriptObjectMirror");
202-
}
203-
204203
public void writeRecords(final Object iRecords) throws IOException {
205204
writeRecords(iRecords, null, null, null);
206205
}

0 commit comments

Comments
 (0)
0