Author: mir
Date: Tue Feb 9 10:54:16 2010
New Revision: 907999
URL: http://svn.apache.org/viewvc?rev=907999&view=rev
Log:
CLEREZZA-103: AbstractDiscobitsHandler now checks if getHierarchyService()
returns null
Modified:
incubator/clerezza/issues/CLEREZZA-103/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/AbstractDiscobitsHandler.java
incubator/clerezza/issues/CLEREZZA-103/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java
Modified:
incubator/clerezza/issues/CLEREZZA-103/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/AbstractDiscobitsHandler.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-103/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/AbstractDiscobitsHandler.java?rev=907999&r1=907998&r2=907999&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-103/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/AbstractDiscobitsHandler.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-103/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/AbstractDiscobitsHandler.java
Tue Feb 9 10:54:16 2010
@@ -68,14 +68,20 @@
* @return the hierarchy service
*/
protected abstract HierarchyService getHierarchyService();
-
+
@Override
public void put(UriRef infoDiscoBitUri, MediaType mediaType,
byte[] data) {
GraphNode infoDiscoBitNode;
try {
- infoDiscoBitNode =
getHierarchyService().createNonCollectionNode(infoDiscoBitUri);
+ HierarchyService hierarchyService =
getHierarchyService();
+ if (hierarchyService == null) {
+ infoDiscoBitNode = new
GraphNode(infoDiscoBitUri, getMGraph());
+ } else {
+ infoDiscoBitNode =
hierarchyService.createNonCollectionNode(infoDiscoBitUri);
+ }
+
} catch (NodeAlreadyExistsException ex) {
infoDiscoBitNode = new GraphNode(infoDiscoBitUri,
getMGraph());
}
@@ -123,8 +129,13 @@
}
GraphNode graphNode;
try {
- graphNode =
getHierarchyService().getHierarchyNode((UriRef) node);
- ((HierarchyNode) graphNode).delete();
+ HierarchyService hierarchyService =
getHierarchyService();
+ if (hierarchyService == null) {
+ graphNode = new GraphNode(node, mGraph);
+ } else {
+ graphNode =
hierarchyService.getHierarchyNode((UriRef) node);
+ ((HierarchyNode) graphNode).delete();
+ }
} catch (NodeDoesNotExistException ex) {
graphNode = new GraphNode(node, mGraph);
}
Modified:
incubator/clerezza/issues/CLEREZZA-103/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-103/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java?rev=907999&r1=907998&r2=907999&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-103/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-103/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java
Tue Feb 9 10:54:16 2010
@@ -20,7 +20,6 @@
import java.util.Collections;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -49,9 +48,7 @@
import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
import org.apache.clerezza.platform.typehandlerspace.SupportedTypes;
import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.Triple;
import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.utils.GraphNode;
/**
