Changeset 5584

Timestamp:

Mar 15, 2011, 2:19:25 PM (13 years ago)

Author:

Nicklas Nordborg

Message:

References #1584: NullPointerException? when configuring Base1PluginExecuter if 'descr' field is missing

No need to reload configuration from database unless we really want to set the description.

File:

• branches/2.17-stable/src/plugins/core/net/sf/basedb/plugins/Base1PluginExecuter.java (modified) (1 diff)

branches/2.17-stable/src/plugins/core/net/sf/basedb/plugins/Base1PluginExecuter.java

@@ -414 +414 @@
           if (config != null)
           {
-            if (config.isInDatabase()) config = PluginConfiguration.getById(dc,config.getId());
             String description = headers.get("descr");
             if (description != null)
             {
+              if (config.isInDatabase()) config = PluginConfiguration.getById(dc,config.getId());
               config.setDescription(description.replaceAll("\\\\r\\\\n|\\\\n", "\n"));
             }