Providing messages from unexpected ICF exceptions to upper layers.

Evolveum · Sep 18, 2015 · 469df2b · 469df2b
1 parent 4b465d6
commit 469df2b
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/...l/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java b/...l/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
@@ -319,7 +319,7 @@ public void configure(PrismContainerValue<?> configuration, OperationResult pare
 			} else if (midpointEx instanceof Error) {
 				throw (Error) midpointEx;
 			} else {
-				throw new SystemException("Got unexpected exception: " + ex.getClass().getName(), ex);
+				throw new SystemException("Got unexpected exception: " + ex.getClass().getName() + ": " + ex.getMessage(), ex);
 			}
 		}
 
@@ -622,7 +622,7 @@ private void retrieveResourceSchema(List<QName> generateObjectClasses, Operation
 				throw (Error) midpointEx;
 			} else {
 				icfResult.recordFatalError(midpointEx.getMessage(), midpointEx);
-				throw new SystemException("Got unexpected exception: " + ex.getClass().getName(), ex);
+				throw new SystemException("Got unexpected exception: " + ex.getClass().getName() + ": " + ex.getMessage(), ex);
 			}
 		}
 
@@ -1435,7 +1435,7 @@ public Collection<ResourceAttribute<?>> addObject(PrismObject<? extends ShadowTy
 			} else if (midpointEx instanceof Error) {
 				throw (Error) midpointEx;
 			} else {
-				throw new SystemException("Got unexpected exception: " + ex.getClass().getName(), ex);
+				throw new SystemException("Got unexpected exception: " + ex.getClass().getName() + ": " + ex.getMessage(), ex);
 			}
 		}
 
@@ -1738,7 +1738,7 @@ public Set<PropertyModificationOperation> modifyObject(ObjectClassComplexTypeDef
 			} else if (midpointEx instanceof Error){
 				throw (Error) midpointEx;
 			}else{
-				throw new SystemException("Got unexpected exception: " + ex.getClass().getName(), ex);
+				throw new SystemException("Got unexpected exception: " + ex.getClass().getName() + ": " + ex.getMessage(), ex);
 			}
 		}
 
@@ -1816,7 +1816,7 @@ public Set<PropertyModificationOperation> modifyObject(ObjectClassComplexTypeDef
 					} else if (midpointEx instanceof Error) {
 						throw (Error) midpointEx;
 					} else {
-						throw new SystemException("Got unexpected exception: " + ex.getClass().getName(), ex);
+						throw new SystemException("Got unexpected exception: " + ex.getClass().getName() + ": " + ex.getMessage(), ex);
 					}
 				}
 			}
@@ -1871,7 +1871,7 @@ public Set<PropertyModificationOperation> modifyObject(ObjectClassComplexTypeDef
 			} else if (midpointEx instanceof Error) {
 				throw (Error) midpointEx;
 			} else {
-				throw new SystemException("Got unexpected exception: " + ex.getClass().getName(), ex);
+				throw new SystemException("Got unexpected exception: " + ex.getClass().getName() + ": " + ex.getMessage(), ex);
 			}
 		}
 		checkAndExecuteAdditionalOperation(reporter, additionalOperations, BeforeAfterType.AFTER, result);
@@ -1973,7 +1973,7 @@ public void deleteObject(ObjectClassComplexTypeDefinition objectClass, Collectio
 			} else if (midpointEx instanceof Error) {
 				throw (Error) midpointEx;
 			} else {
-				throw new SystemException("Got unexpected exception: " + ex.getClass().getName(), ex);
+				throw new SystemException("Got unexpected exception: " + ex.getClass().getName() + ": " + ex.getMessage(), ex);
 			}
 		}
 
@@ -2029,7 +2029,7 @@ public <T> PrismProperty<T> fetchCurrentToken(ObjectClassComplexTypeDefinition o
 			} else if (midpointEx instanceof Error) {
 				throw (Error) midpointEx;
 			} else {
-				throw new SystemException("Got unexpected exception: " + ex.getClass().getName(), ex);
+				throw new SystemException("Got unexpected exception: " + ex.getClass().getName() + ": " + ex.getMessage(), ex);
 			}
 		}
 
@@ -2118,7 +2118,7 @@ public boolean handle(SyncDelta delta) {
 			} else if (midpointEx instanceof Error) {
 				throw (Error) midpointEx;
 			} else {
-				throw new SystemException("Got unexpected exception: " + ex.getClass().getName(), ex);
+				throw new SystemException("Got unexpected exception: " + ex.getClass().getName() + ": " + ex.getMessage(), ex);
 			}
 		}
 		// convert changes from icf to midpoint Change
@@ -2335,7 +2335,7 @@ private void recordResume() {
 			} else if (midpointEx instanceof Error) {
 				throw (Error) midpointEx;
 			} else {
-				throw new SystemException("Got unexpected exception: " + ex.getClass().getName() + ": "+ex.getMessage(), ex);
+				throw new SystemException("Got unexpected exception: " + ex.getClass().getName() + ": " + ex.getMessage(), ex);
 			}
 		}
 
@@ -2459,7 +2459,7 @@ public boolean handle(ConnectorObject connectorObject) {
             } else if (midpointEx instanceof Error) {
                 throw (Error) midpointEx;
             } else {
-                throw new SystemException("Got unexpected exception: " + ex.getClass().getName(), ex);
+                throw new SystemException("Got unexpected exception: " + ex.getClass().getName() + ": " + ex.getMessage(), ex);
             }
         }
 
@@ -2891,7 +2891,7 @@ private Object executeScriptIcf(StateReporter reporter, ExecuteProvisioningScrip
 				} else if (midpointEx instanceof Error) {
 					throw (Error) midpointEx;
 				} else {
-					throw new SystemException("Got unexpected exception: " + ex.getClass().getName(), ex);
+					throw new SystemException("Got unexpected exception: " + ex.getClass().getName() + ": " + ex.getMessage(), ex);
 				}
 			}