Changeset 14857

Timestamp:

11/27/10 11:40:52 (18 months ago)

Author:

rcmatthews

Message:

final changes before copying across to Isis project

Location:

framework/trunk/plugins/nosql-persistor/src/main/java/org/nakedobjects/plugins

Files:

• file/server/FileServerProcessor.java (modified) (1 diff)
• nosql/WriteObjectCommand.java (modified) (1 diff)

framework/trunk/plugins/nosql-persistor/src/main/java/org/nakedobjects/plugins/file/server/FileServerProcessor.java

@@ -332 +332 @@
     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);
     }

framework/trunk/plugins/nosql-persistor/src/main/java/org/nakedobjects/plugins/nosql/WriteObjectCommand.java

@@ -123 +123 @@
             for (NakedObject element : collectionFacet.iterable(collection)) {
                StateWriter elementWriter = writer.createElementWriter();
-               writeFields(elementWriter, association.getSpecification().getFullName(), element);
+               writeFields(elementWriter, element.getSpecification().getFullName(), element);
                elements.add(elementWriter);
             }