Merge remote-tracking branch 'origin/master' into feature/extension-n…

…ormalization
Evolveum · Feb 9, 2018 · 0458cd5 · 0458cd5
2 parents 817d409 + 6e52e3c
commit 0458cd5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/gui/admin-gui/testng-integration.xml b/gui/admin-gui/testng-integration.xml
@@ -19,7 +19,7 @@
 	<test name="Web Integration" preserve-order="true" parallel="false" verbose="10">
         <classes>
         	<class name="com.evolveum.midpoint.web.TestCleanStartup"/>
-        	<!--<class name="com.evolveum.midpoint.web.TestIntegrationObjectWrapperFactory"/>-->
+        	<class name="com.evolveum.midpoint.web.TestIntegrationObjectWrapperFactory"/>
         	<class name="com.evolveum.midpoint.web.TestIntegrationSecurity"/>
         </classes>
     </test>

diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/ProfilingConfigurationManager.java b/infra/common/src/main/java/com/evolveum/midpoint/common/ProfilingConfigurationManager.java
@@ -33,7 +33,7 @@ public class ProfilingConfigurationManager {
     private static final Trace LOGGER = TraceManager.getTrace(ProfilingConfigurationManager.class);
 
     private static final String REQUEST_FILTER_LOGGER_CLASS_NAME = "com.evolveum.midpoint.web.util.MidPointProfilingServletFilter";
-    private static final String SUBSYSTEM_PROFILING_LOGGER = "com.evolveum.midpoint.util.aspect.ProfilingDataManager";
+    private static final String SUBSYSTEM_PROFILING_LOGGER = ProfilingDataManager.class.getName();
     private static final String APPENDER_IDM_PROFILE = "MIDPOINT_PROFILE_LOG";
 
     /**

diff --git a/infra/util/src/main/java/com/evolveum/midpoint/util/aspect/MethodUsageStatistics.java b/infra/util/src/main/java/com/evolveum/midpoint/util/aspect/MethodUsageStatistics.java
@@ -39,7 +39,7 @@
  * */
 public class MethodUsageStatistics {
 
-    private static Trace LOGGER = TraceManager.getTrace(ProfilingDataManager.class);
+    private static final Trace LOGGER = TraceManager.getTrace(ProfilingDataManager.class);
 
     private long min = Long.MAX_VALUE;
     private long max = 0;