java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a61bfd8d340ed57f7020d638eaa03bb310c79c5b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 31 14:52:56 2013 +0100
896015 - we need to set elaboration params anyway
not only if we plan to elaborate
addressing:
java.lang.NullPointerException
at java.util.HashMap.<init>(HashMap.java:318)
at
com.redhat.rhn.common.db.datasource.CachedStatement.executeElaboratorBatch(CachedStatement.java:371)
at
com.redhat.rhn.common.db.datasource.CachedStatement.executeElaborator(CachedStatement.java:360)
at com.redhat.rhn.common.db.datasource.SelectMode.elaborate(SelectMode.java:164)
at
com.redhat.rhn.common.db.datasource.ModeElaborator.elaborate(ModeElaborator.java:48)
at
com.redhat.rhn.frontend.taglibs.list.decorators.ElaborationDecorator.elaborateContents(ElaborationDecorator.java:57)
at
com.redhat.rhn.frontend.taglibs.list.decorators.ElaborationDecorator.setCurrentList(ElaborationDecorator.java:37)
at com.redhat.rhn.frontend.taglibs.list.ListTag.doAfterBody(ListTag.java:465)
...
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 75e3afe..99d59bf 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2698,8 +2698,8 @@ public class SystemManager extends BaseManager {
params.put("user_id", user.getId());
params.put("set_label", setLabel);
retval = mode.execute(params);
+ retval.setElaborationParams(Collections.EMPTY_MAP);
if (elaborate) {
- retval.setElaborationParams(Collections.EMPTY_MAP);
retval.elaborate();
}
return retval;