Changeset 64:c48435e7f312 in AnnotationManagerN4J for src

Timestamp:

Dec 3, 2012, 5:42:20 PM (11 years ago)

Author:

casties

Branch:

default

Message:

fix npe when an annotation has no creator.

File:

• src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java (modified) (4 diffs)

src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java

@@ -67 +67 @@
 
     public String encodeJsonId(String id) {
-        if (id == null) return null;
+        if (id == null)
+            return null;
         try {
             return Base64.encodeBase64URLSafeString(id.getBytes("UTF-8"));
@@ -76 +77 @@
 
     public String decodeJsonId(String id) {
-        if (id == null) return null;
+        if (id == null)
+            return null;
         try {
             return new String(Base64.decodeBase64(id), "UTF-8");
@@ -203 +205 @@
              * user
              */
-            if (makeUserObject) {
-                // create user object
-                JSONObject userObject = new JSONObject();
-                Actor creator = annot.getCreator();
-                // save creator as uri
-                userObject.put("uri", creator.getUri());
-                // make short user id
-                String userId = creator.getIdString();
-                // set as id
-                userObject.put("id", userId);
-                // get full name
-                String userName = creator.getName();
-                if (userName == null) {
-                    BaseRestlet restServer = (BaseRestlet) getApplication();
-                    userName = restServer.getFullNameFromLdap(userId);
-                }
-                userObject.put("name", userName);
-                // save user object
-                jo.put("user", userObject);
-            } else {
-                // save user as string
-                jo.put("user", annot.getCreatorUri());
+            Actor creator = annot.getCreator();
+            if (creator != null) {
+                if (makeUserObject) {
+                    // create user object
+                    JSONObject userObject = new JSONObject();
+                    // save creator as uri
+                    userObject.put("uri", creator.getUri());
+                    // make short user id
+                    String userId = creator.getIdString();
+                    // set as id
+                    userObject.put("id", userId);
+                    // get full name
+                    String userName = creator.getName();
+                    if (userName == null) {
+                        BaseRestlet restServer = (BaseRestlet) getApplication();
+                        userName = restServer.getFullNameFromLdap(userId);
+                    }
+                    userObject.put("name", userName);
+                    // save user object
+                    jo.put("user", userObject);
+                } else {
+                    // save user as string
+                    jo.put("user", annot.getCreatorUri());
+                }
             }
 
@@ -601 +605 @@
             throw new JSONException("Annotation has no valid target fragment!");
         }
-        
+
         /*
          * permissions