[infinispan-commits] Infinispan SVN: r1127 - trunk/demos/ec2/src/main/java/org/infinispan/ec2demo.

[infinispan-commits at lists.jboss.org]

Author: noelo
Date: 2009-11-11 03:35:42 -0500 (Wed, 11 Nov 2009)
New Revision: 1127

Modified:
   trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/CacheBuilder.java
Log:
system property EC2Demo-jgroups-config overrides jgroups_file servelet context param


Modified: trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/CacheBuilder.java
===================================================================
--- trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/CacheBuilder.java	2009-11-11 07:48:38 UTC (rev 1126)
+++ trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/CacheBuilder.java	2009-11-11 08:35:42 UTC (rev 1127)
@@ -21,15 +21,19 @@
 	private CacheManager cache_manager;
 	private static final Log myLogger = LogFactory.getLog(CacheBuilder.class);
 
-	public CacheBuilder(String configFile) throws IOException {
-		myLogger.debug("CacheBuilder called with "+configFile);
+	public CacheBuilder(String inConfigFile) throws IOException {
+		//system property gets priority
+		String configFile = System.getProperty("EC2Demo-jgroups-config");		
+
 		if ((configFile==null)||(configFile.isEmpty()))
-			configFile = System.getProperty("EC2Demo-jgroups-config");
+			configFile = inConfigFile;
 		
 		if ((configFile==null)||(configFile.isEmpty()))
 			throw new RuntimeException(
 					"Need to either set system property EC2Demo-jgroups-config to point to the jgroups configuration file or pass in the the location of the jgroups configuration file");
 
+		System.out.println("CacheBuilder called with "+configFile);
+		
 		GlobalConfiguration gc = GlobalConfiguration.getClusteredDefault();
 		gc.setClusterName("infinispan-demo-cluster");
 		gc.setTransportClass(JGroupsTransport.class.getName());