Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Apr 5, 2016 · 925efbe · 925efbe
2 parents 1404431 + 955b893
commit 925efbe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -1473,7 +1473,7 @@ protected void setTimeZone(PageBase page){
         }
         if (timeZone != null) {
             WebSession.get().getClientInfo().getProperties().
-                    setTimeZone(TimeZone.getTimeZone(principal.getAdminGuiConfiguration().getDefaultTimezone()));
+                    setTimeZone(TimeZone.getTimeZone(timeZone));
         }
     }
 

diff --git a/...odel-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationService.java b/...odel-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationService.java
@@ -1104,14 +1104,16 @@ public void setDoesNotMatchTaskSpecification() {
 		}
 
 		private void setSituation(SynchronizationInformation.Record increment, SynchronizationSituationType situation) {
-			switch (situation) {
-				case LINKED: increment.setCountLinked(1); break;
-				case UNLINKED: increment.setCountUnlinked(1); break;
-				case DELETED: increment.setCountDeleted(1); break;
-				case DISPUTED: increment.setCountDisputed(1); break;
-				case UNMATCHED: increment.setCountUnmatched(1); break;
-				default:
-					// noop (or throw exception?)
+			if (situation != null) {
+				switch (situation) {
+					case LINKED: increment.setCountLinked(1); break;
+					case UNLINKED: increment.setCountUnlinked(1); break;
+					case DELETED: increment.setCountDeleted(1); break;
+					case DISPUTED: increment.setCountDisputed(1); break;
+					case UNMATCHED: increment.setCountUnmatched(1); break;
+					default:
+						// noop (or throw exception?)
+				}
 			}
 		}