[OpenbravoERP-commits] devel/pi: Issue 27351. Backed out rev. 24307, changeset: daa69c1...

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/077fca7b3c70
changeset: 24308:077fca7b3c70
user:      Rafa Alonso <rafael.alonso <at> openbravo.com>
date:      Sat Aug 23 09:05:26 2014 +0200
summary:   Issue 27351. Backed out rev. 24307, changeset: daa69c127184
refactor (kernel, datasource)
may the changeset not pass the tests

diffstat:

 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelComponentProvider.java
               |  8 ++++----
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceComponentProvider.java
 |  8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (62 lines):

diff -r daa69c127184 -r 077fca7b3c70 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelComponentProvider.java
--- 
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelComponentProvider.java
  Sat Aug 23 01:31:40 2014 +0200
+++ 
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelComponentProvider.java
  Sat Aug 23 09:05:26 2014 +0200
@@ -37,8 +37,6 @@
 public class KernelComponentProvider extends BaseComponentProvider {
   public static final String QUALIFIER = KernelConstants.KERNEL_COMPONENT_TYPE;
 
-  private List<ComponentResource> globalResources = null;
-
   /*
    * (non-Javadoc)
    * 
@@ -82,12 +80,14 @@
     return versionParam;
   }
 
+  final List<ComponentResource> globalResources = new 
ArrayList<ComponentResource>();
+
   @Override
   public synchronized List<ComponentResource> getGlobalComponentResources() {
-    if (globalResources != null) {
+    if (globalResources.size() > 0) {
       return globalResources;
     }
-    globalResources = new ArrayList<ComponentResource>();
+    globalResources.clear();
 
     globalResources.add(createStaticResource("org.openbravo.client.kernel/"
         + KernelConstants.KERNEL_COMPONENT_TYPE + "/" + 
KernelConstants.APPLICATION_COMPONENT_ID,
diff -r daa69c127184 -r 077fca7b3c70 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceComponentProvider.java
--- 
a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceComponentProvider.java
    Sat Aug 23 01:31:40 2014 +0200
+++ 
b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceComponentProvider.java
    Sat Aug 23 09:05:26 2014 +0200
@@ -41,8 +41,6 @@
 public class DataSourceComponentProvider extends BaseComponentProvider {
   public final static String QUALIFIER = DataSourceConstants.DS_COMPONENT_TYPE;
 
-  private List<ComponentResource> globalResources = null;
-
   @Inject
   private DataSourceServiceProvider dataSourceServiceProvider;
 
@@ -77,16 +75,18 @@
     return dataSourceComponent;
   }
 
+  final List<ComponentResource> globalResources = new 
ArrayList<ComponentResource>();
+
   /**
    * @return an empty String (no global resources)
    * @see 
org.openbravo.client.kernel.ComponentProvider#getGlobalComponentResources()
    */
   @Override
   public synchronized List<ComponentResource> getGlobalComponentResources() {
-    if (globalResources != null) {
+    if (globalResources.size() > 0) {
       return globalResources;
     }
-    globalResources = new ArrayList<ComponentResource>();
+    globalResources.clear();
 
     globalResources.add(createStaticResource(
         "web/org.openbravo.service.datasource/js/ob-datasource-utilities.js", 
true));

------------------------------------------------------------------------------
Slashdot TV.  
Video for Nerds.  Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits