From a767bda603119387af8e8ce06af268470fe33c3a Mon Sep 17 00:00:00 2001
From: Marc Schoechlin <marc.schoechlin@breuninger.de>
Date: Sun, 4 Jan 2015 12:16:25 +0100
Subject: [PATCH] Memory configuration

Reduce the default memory minimal overhead of activemq from 1G to 64M to
ensure that activemq does not revoke to work in small environments.
If a larger process heap than 64M is needed the jvm grows up to 1GB.

Conflicts:
	assembly/src/release/bin/env
---
 assembly/src/release/bin/env | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/assembly/src/release/bin/env b/assembly/src/release/bin/env
index 3673fd4b62..5825080f58 100644
--- a/assembly/src/release/bin/env
+++ b/assembly/src/release/bin/env
@@ -23,10 +23,8 @@
 # invoke the init-script without a argument an review help section "Configuration of this script"
 # /etc/default/activemq <activemq user home>/.activemqrc <activemq installation dir>/bin/env
 
-# Set jvm memory configuration
-if [ -z "$ACTIVEMQ_OPTS_MEMORY" ] ; then
-    ACTIVEMQ_OPTS_MEMORY="-Xms1G -Xmx1G"
-fi
+# Set jvm memory configuration (minimal/maximum amount of memory)
+ACTIVEMQ_OPTS_MEMORY="-Xms64M -Xmx1G"
 
 if [ -z "$ACTIVEMQ_OPTS" ] ; then
     ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Djava.util.logging.config.file=logging.properties -Djava.security.auth.login.config=$ACTIVEMQ_CONF/login.config"