src/windows/native/sun/windows/awt_Component.cpp

*** 3526,3537 ****
--- 3526,3541 ----
          translation = wChar[0];
      }
      if (ops == SAVE) {
          transTable.put(reinterpret_cast<void*>(static_cast<INT_PTR>(wkey)),
                         reinterpret_cast<void*>(static_cast<INT_PTR>(translation)));
+         if (deadKeyFlag) {
              deadKeyFlagTable.put(reinterpret_cast<void*>(static_cast<INT_PTR>(wkey)),
                           reinterpret_cast<void*>(static_cast<INT_PTR>(deadKeyFlag)));
+         } else {
+             deadKeyFlagTable.remove(reinterpret_cast<void*>(static_cast<INT_PTR>(wkey)));
+         }
      }
  
      isDeadKey = deadKeyFlag;
      return translation;
  }