You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2012/06/20 22:08:21 UTC

svn commit: r1352290 - /rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaTag.java

Author: mfranklin
Date: Wed Jun 20 20:08:20 2012
New Revision: 1352290

URL: http://svn.apache.org/viewvc?rev=1352290&view=rev
Log:
Fixed tag implementation RAVE-666

Modified:
    rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaTag.java

Modified: rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaTag.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaTag.java?rev=1352290&r1=1352289&r2=1352290&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaTag.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaTag.java Wed Jun 20 20:08:20 2012
@@ -48,7 +48,7 @@ public class JpaTag implements BasicEnti
     public static final String FIND_BY_KEYWORD = "findByKeyword";
     public static final String GET_ALL = "getAll";
     public static final String COUNT_ALL = "countAll";
-    public static final String GET_ALL_NOT_IN_WIDGET="getAllNotInWidget" ;
+    public static final String GET_ALL_NOT_IN_WIDGET = "getAllNotInWidget";
     public static final String KEYWORD_PARAM = "keyword";
 
     @Autowired
@@ -69,7 +69,7 @@ public class JpaTag implements BasicEnti
     @Column(name = "keyword", unique = true)
     private String keyword;
 
-    @OneToMany(mappedBy="tag")
+    @OneToMany(mappedBy = "tag")
     public List<JpaWidgetTag> widgets;
 
 
@@ -106,11 +106,13 @@ public class JpaTag implements BasicEnti
 
     @Override
     public void setWidgets(List<WidgetTag> widgets) {
-        if(this.widgets == null){
+        if (this.widgets == null) {
             this.widgets = new ArrayList<JpaWidgetTag>();
         }
         this.getWidgets().clear();
-        this.getWidgets().addAll(widgets);
+        if (widgets != null) {
+            this.getWidgets().addAll(widgets);
+        }
     }
 
     @Override