Bug 383637 - EventRequestManagerImpl#addRequestIDMapping and
#removeRequestIDMapping does not handle VMDeathRequests
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestManagerImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestManagerImpl.java
index dfa0d8f..4d92183 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestManagerImpl.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/request/EventRequestManagerImpl.java
@@ -557,6 +557,8 @@
 			MONITOR_WAIT_TYPE.enabledrequests.remove(req.requestID());
 		} else if(req instanceof MonitorWaitedRequestImpl) {
 			MONITOR_WAITED_TYPE.enabledrequests.remove(req.requestID());
+		} else if(req instanceof VMDeathRequestImpl) {
+			VM_DEATH_TYPE.enabledrequests.remove(req.requestID());
 		}
 	}
 	
@@ -594,6 +596,8 @@
 			MONITOR_CONTENDED_ENTER_TYPE.enabledrequests.put(req.requestID(), (MonitorContendedEnterRequestImpl)req);
 		} else if(req instanceof MonitorContendedEnteredRequestImpl) {
 			MONITOR_CONTENDED_ENTERED_TYPE.enabledrequests.put(req.requestID(), (MonitorContendedEnteredRequestImpl)req);
+		} else if(req instanceof VMDeathRequestImpl) {
+			VM_DEATH_TYPE.enabledrequests.put(req.requestID(), (VMDeathRequest) req);
 		}
 	}