clean CharsetManagerJob shutdown eclipse-platform#1427

To prevent logging exception on shutdown at end of Junit tests:
'Workspace was not properly initialized or has already shutdown.'

eclipse-platform#1427

resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/CharsetDeltaJob.java

@@ -240,6 +240,7 @@ public void shutdown() {
 		try {
 			// try to prevent execution of this job to avoid "already shutdown.":
 			cancel();
+			wakeUp();
 			// if job is already running wait for it to finish:
 			join(3000, null);
 		} catch (InterruptedException e) {

resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/CharsetManager.java

@@ -68,6 +68,7 @@ public CharsetManagerJob() {
 			super(Messages.resources_charsetUpdating);
 			setSystem(true);
 			setPriority(Job.INTERACTIVE);
+			setRule(workspace.getRoot());
 		}
 
 		@Override
@@ -102,7 +103,7 @@ protected IStatus run(IProgressMonitor monitor) {
 					workspace.prepareOperation(rule, monitor);
 					workspace.beginOperation(true);
 					Map.Entry<IProject, Boolean> next;
-					while ((next = getNextChange()) != null) {
+					while (!monitor.isCanceled() && ((next = getNextChange()) != null)) {
 						//just exit if the system is shutting down or has been shut down
 						//it is too late to change the workspace at this point anyway
 						if (systemBundle.getState() != Bundle.ACTIVE)
@@ -143,6 +144,16 @@ public boolean shouldRun() {
 				return !asyncChanges.isEmpty();
 			}
 		}
+
+		public void shutDown() {
+			cancel();
+			wakeUp();
+			try {
+				join(3000, null);
+			} catch (OperationCanceledException | InterruptedException ignored) {
+				// nothing
+			}
+		}
 	}
 
 	private class ResourceChangeListener implements IResourceChangeListener {
@@ -495,6 +506,9 @@ private void setCharsetForHasFailed(IPath resourcePath, BackingStoreException e)
 
 	@Override
 	public void shutdown(IProgressMonitor monitor) {
+		if (job != null) {
+			job.shutDown();
+		}
 		InstanceScope.INSTANCE.getNode(ResourcesPlugin.PI_RESOURCES)
 				.removePreferenceChangeListener(preferenceChangeListener);