rave-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfrank...@apache.org
Subject svn commit: r1206980 - in /incubator/rave/trunk/rave-shindig/src: main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java
Date Mon, 28 Nov 2011 05:39:46 GMT
Author: mfranklin
Date: Mon Nov 28 05:39:45 2011
New Revision: 1206980

URL: http://svn.apache.org/viewvc?rev=1206980&view=rev
Log:
Fixed error intruduced in last (bad) commit

Modified:
    incubator/rave/trunk/rave-shindig/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java
    incubator/rave/trunk/rave-shindig/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java

Modified: incubator/rave/trunk/rave-shindig/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java?rev=1206980&r1=1206979&r2=1206980&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java
(original)
+++ incubator/rave/trunk/rave-shindig/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java
Mon Nov 28 05:39:45 2011
@@ -56,7 +56,9 @@ public class FieldRestrictingPerson impl
     public FieldRestrictingPerson(org.apache.rave.portal.model.Person internal, Set<String>
fields) {
         this.internal = internal;
         this.fields = fields;
-        this.propertyMap = createPropertyMap(internal.getProperties());
+        if(internal != null && internal.getProperties() != null) {
+            this.propertyMap = createPropertyMap(internal.getProperties());
+        }
     }
 
     //REQUIRED FIELD

Modified: incubator/rave/trunk/rave-shindig/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java?rev=1206980&r1=1206979&r2=1206980&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java
(original)
+++ incubator/rave/trunk/rave-shindig/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java
Mon Nov 28 05:39:45 2011
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.apache.rave.opensocial.service;
 
 



Mime
View raw message