diff --git a/org.adempiere.base/src/org/compiere/db/CConnection.java b/org.adempiere.base/src/org/compiere/db/CConnection.java
index e86e86e192..df891990ac 100644
--- a/org.adempiere.base/src/org/compiere/db/CConnection.java
+++ b/org.adempiere.base/src/org/compiere/db/CConnection.java
@@ -926,7 +926,8 @@ public class CConnection implements Serializable, Cloneable
if (!retest && m_ds != null && m_okDB)
return null;
- getDatabase().close();
+ if (getDatabase() != null)
+ getDatabase().close();
m_ds = null;
setDataSource();
// the actual test
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index 5e499556e9..90ebb8c63a 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -21,7 +21,7 @@
-
+
diff --git a/org.adempiere.ui.swing-feature/swingclient.product.launch b/org.adempiere.ui.swing-feature/swingclient.product.launch
index d94907060b..8d6b499243 100644
--- a/org.adempiere.ui.swing-feature/swingclient.product.launch
+++ b/org.adempiere.ui.swing-feature/swingclient.product.launch
@@ -21,8 +21,8 @@
-
-
+
+
diff --git a/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/CacheServiceImpl.java b/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/CacheServiceImpl.java
index c9f9b10301..f8cc75a3bf 100644
--- a/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/CacheServiceImpl.java
+++ b/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/CacheServiceImpl.java
@@ -36,17 +36,26 @@ public class CacheServiceImpl implements ICacheService {
*/
@Override
public Map getMap(String name) {
- return Activator.hazelcastInstance.getMap(name);
+ if (Activator.hazelcastInstance != null)
+ return Activator.hazelcastInstance.getMap(name);
+ else
+ return null;
}
@Override
public List getList(String name) {
- return Activator.hazelcastInstance.getList(name);
+ if (Activator.hazelcastInstance != null)
+ return Activator.hazelcastInstance.getList(name);
+ else
+ return null;
}
@Override
public Set getSet(String name) {
- return Activator.hazelcastInstance.getSet(name);
+ if (Activator.hazelcastInstance != null)
+ return Activator.hazelcastInstance.getSet(name);
+ else
+ return null;
}
}