Revision: 15675
Author: emmartins
Date: Wed Dec 8 06:06:16 2010
Log: Fixes Issue 2196
http://code.google.com/p/mobicents/source/detail?r=15675
Modified:
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/deployment/DeployableUnitBuilderImpl.java
/trunk/servers/jain-slee/core/profiles/src/main/java/org/mobicents/slee/container/deployment/profile/jpa/ConcreteProfileEntityGenerator.java
/trunk/servers/jain-slee/core/router/src/main/java/org/mobicents/slee/runtime/eventrouter/mapping/ActivityHashingEventRouterExecutorMapper.java
=======================================
---
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/deployment/DeployableUnitBuilderImpl.java
Mon May 10 08:09:11 2010
+++
/trunk/servers/jain-slee/core/components/components/src/main/java/org/mobicents/slee/container/component/deployment/DeployableUnitBuilderImpl.java
Wed Dec 8 06:06:16 2010
@@ -120,10 +120,6 @@
"Failed to open DU file as JAR file: "
+ sourceUrl.getFile(),
e);
}
-
- if (deployableUnitJar == null) {
- throw new NullPointerException("null
deployableUnitJar");
- }
// get and parse du descriptor
JarEntry duXmlEntry = deployableUnitJar
@@ -642,7 +638,7 @@
try {
String fileWithPath = duURL.getFile();
int start = fileWithPath.lastIndexOf('/') + 1;
- String filename = Math.abs(duURL.hashCode()) + "_" +
fileWithPath.substring(start, fileWithPath.length());
+ String filename = Math.abs((long)duURL.hashCode()) + "_" +
fileWithPath.substring(start, fileWithPath.length());
File tempFile = new File(deploymentRoot, filename);
=======================================
---
/trunk/servers/jain-slee/core/profiles/src/main/java/org/mobicents/slee/container/deployment/profile/jpa/ConcreteProfileEntityGenerator.java
Tue Aug 24 08:11:16 2010
+++
/trunk/servers/jain-slee/core/profiles/src/main/java/org/mobicents/slee/container/deployment/profile/jpa/ConcreteProfileEntityGenerator.java
Wed Dec 8 06:06:16 2010
@@ -189,7 +189,7 @@
}
}
- String tableName
= "SLEE_PE_"+profileComponent.getProfileCmpInterfaceClass().getSimpleName()
+ "_" + Math.abs(profileComponent.getComponentID().hashCode());
+ String tableName
= "SLEE_PE_"+profileComponent.getProfileCmpInterfaceClass().getSimpleName()
+ "_" + Math.abs((long)profileComponent.getComponentID().hashCode());
addTableAnnotation(tableName, uniqueConstraints,
concreteProfileEntityClass);
jpaProfileDataSource.setProfileEntityArrayAttrValueClassMap(profileEntityArrayAttrValueClassMap);
@@ -275,7 +275,7 @@
ClassGeneratorUtils.addAnnotation( Entity.class.getName(), new
LinkedHashMap<String, Object>(), concreteArrayValueClass );
// generate a random table name
-
addTableAnnotationToPEAAV("SLEE_PEAAV_"+profileComponent.getProfileCmpInterfaceClass().getSimpleName()
+ "_" + Math.abs(profileComponent.getComponentID().hashCode()) +
profileAttributeName,unique,concreteArrayValueClass);
+
addTableAnnotationToPEAAV("SLEE_PEAAV_"+profileComponent.getProfileCmpInterfaceClass().getSimpleName()
+ "_" + Math.abs((long)profileComponent.getComponentID().hashCode()) +
profileAttributeName,unique,concreteArrayValueClass);
// override @id
String getIdNameMethodSrc = "public long getId() { return
super.getId(); }";
=======================================
---
/trunk/servers/jain-slee/core/router/src/main/java/org/mobicents/slee/runtime/eventrouter/mapping/ActivityHashingEventRouterExecutorMapper.java
Mon Apr 26 08:37:10 2010
+++
/trunk/servers/jain-slee/core/router/src/main/java/org/mobicents/slee/runtime/eventrouter/mapping/ActivityHashingEventRouterExecutorMapper.java
Wed Dec 8 06:06:16 2010
@@ -26,7 +26,7 @@
@Override
public EventRouterExecutor getExecutor(
ActivityContextHandle activityContextHandle) {
- return executors[Math.abs(activityContextHandle.hashCode())
+ return executors[(activityContextHandle.hashCode() &
Integer.MAX_VALUE)
% executors.length];
}