Merge remote-tracking branch 'origin/master' into feature/pool-upgrade

Evolveum · Feb 28, 2018 · 5ca021a · 5ca021a
2 parents bbe268e + 9cbb278
commit 5ca021a
Show file tree

Hide file tree

Showing 7 changed files with 233 additions and 36 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ before_install:
   - unzip -qq apache-maven-3.5.0-bin.zip
   - export M2_HOME=$PWD/apache-maven-3.5.0
   - export PATH=$M2_HOME/bin:$PATH
-  - export MAVEN_OPTS='-Xmx4g'
+  - export MAVEN_OPTS='-Xmx6g'
 
 # custom script is used so build and tests are done in one mvn command, separating it (as Travis does by default) leads to problem with ConnId (notably DummyResource)
 script: mvn clean install
@@ -26,6 +26,10 @@ addons:
     #packages:
       #- oracle-java8-installer # install newest JDK8
 
+env:
+  global:
+    - MALLOC_ARENA_MAX=2
+
 jdk:
   #- openjdk7
   #- oraclejdk7

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
@@ -279,11 +279,14 @@ public void updateAjaxAttributes(AbstractDefaultAjaxBehavior behavior, AjaxReque
 
         //descriptor loader, used for customization
         new DescriptorLoader().loadData(this);
-
-        Map<String, MidPointApplicationConfiguration> map =
-                applicationContext.getBeansOfType(MidPointApplicationConfiguration.class);
-        if (map != null) {
-            map.forEach((key, value) -> value.init(this));
+
+        if (applicationContext != null) {
+
+	        Map<String, MidPointApplicationConfiguration> map =
+	                applicationContext.getBeansOfType(MidPointApplicationConfiguration.class);
+	        if (map != null) {
+	            map.forEach((key, value) -> value.init(this));
+	        }
         }
 
         // for schrodinger selenide library

diff --git a/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less b/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
@@ -1288,4 +1288,10 @@ dd.stacktrace::before {
 td.prop-name {
 	min-width: 90px;
 	font-weight: bold;
+}
+
+th.icon {
+	// We want this column to fit as tightly as possible.
+	// The content of this column is just a single icon.
+	width: -moz-min-content;
 }
diff --git a/gui/admin-gui/src/main/resources/static/less/midpoint/page-user-details.less b/gui/admin-gui/src/main/resources/static/less/midpoint/page-user-details.less
@@ -102,7 +102,7 @@ table.table {
   }
 
   th.icon {
-    width: 22px;
+//    width: 22px; // MID-4477
     //padding-top: 11px; disabled, I don't know why I add this in here
   }
 }

diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalMonitor.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalMonitor.java
@@ -273,7 +273,9 @@ public static String debugDumpStatic(int indent) {
 		}
 		sb.append("\n");
 		DebugUtil.debugDumpWithLabelLn(sb, "cloneTimingEnabled", cloneTimingEnabled, indent + 1);
-		DebugUtil.debugDumpWithLabelLn(sb, "prismObjectCloneDuration", (prismObjectCloneDurationNanos/1000000)+" ms (" + prismObjectCloneDurationNanos + " ns)", indent + 1);
+		if (cloneTimingEnabled) {
+			DebugUtil.debugDumpWithLabelLn(sb, "prismObjectCloneDuration", (prismObjectCloneDurationNanos/1000000)+" ms (" + prismObjectCloneDurationNanos + " ns)", indent + 1);
+		}
 		DebugUtil.debugDumpWithLabelLn(sb, "resourceCacheStats", resourceCacheStats, indent + 1);
 		DebugUtil.debugDumpWithLabel(sb, "connectorCacheStats", connectorCacheStats, indent + 1);
 		return sb.toString();