You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by rm...@apache.org on 2010/11/28 20:46:30 UTC
svn commit: r1039934 - in
/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql:
WriteObjectCommand.java file/server/FileServerProcessor.java
Author: rmatthews
Date: Sun Nov 28 19:46:29 2010
New Revision: 1039934
URL: http://svn.apache.org/viewvc?rev=1039934&view=rev
Log:
Fixed couple of little bugs in NOSQL store
Modified:
incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/WriteObjectCommand.java
incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/file/server/FileServerProcessor.java
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/WriteObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/WriteObjectCommand.java?rev=1039934&r1=1039933&r2=1039934&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/WriteObjectCommand.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/WriteObjectCommand.java Sun Nov 28 19:46:29 2010
@@ -142,7 +142,7 @@ final class WriteObjectCommand implement
List<StateWriter> elements = new ArrayList<StateWriter>();
for (ObjectAdapter element : collectionFacet.iterable(collection)) {
StateWriter elementWriter = writer.createElementWriter();
- writeFields(elementWriter, association.getSpecification().getFullName(), element);
+ writeFields(elementWriter, element.getSpecification().getFullName(), element);
elements.add(elementWriter);
}
writer.writeCollection(association.getId(), elements);
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/file/server/FileServerProcessor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/file/server/FileServerProcessor.java?rev=1039934&r1=1039933&r2=1039934&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/file/server/FileServerProcessor.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/alternatives/objectstore/nosql/file/server/FileServerProcessor.java Sun Nov 28 19:46:29 2010
@@ -351,7 +351,8 @@ public class FileServerProcessor {
private void hasInstances(ServerConnection connection) throws IOException {
String type = connection.getRequest();
- boolean hasInstances = listFiles(type).length > 0;
+ File[] listFiles = listFiles(type);
+ boolean hasInstances = listFiles != null && listFiles.length > 0;
connection.response(hasInstances);
}