Author: chirino
Date: Thu Dec 16 21:33:27 2010
New Revision: 1050174
URL: http://svn.apache.org/viewvc?rev=1050174&view=rev
Log:
Make sure the props is initialized /w the system properties.
Modified:
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/ConfigStore.scala
Modified:
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/ConfigStore.scala
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/ConfigStore.scala?rev=1050174&r1=1050173&r2=1050174&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/ConfigStore.scala
(original)
+++
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/ConfigStore.scala
Thu Dec 16 21:33:27 2010
@@ -189,7 +189,8 @@ class FileConfigStore extends ConfigStor
def unmarshall(in:Array[Byte], evalProps:Boolean=false) = {
if (evalProps) {
- val props = new Properties(System.getProperties)
+ val props = new Properties()
+ props.putAll(System.getProperties)
val prop_file = file.getParentFile / (file.getName + ".properties")
if( prop_file.exists() ) {
FileSupport.using(new FileInputStream(prop_file)) { is=>
