modules/web/src/main/native/Source/WebCore/platform/URL.cpp

*** 422,440 ****
      if (absolute) {
          parse(str, &relative);
      } else {
          // If the base is empty or opaque (e.g. data: or javascript:), then the URL is invalid
          // unless the relative URL is a single fragment.
          if (!base.isHierarchical()) {
              if (str[0] == '#') {
                  appendASCII(base.m_string.left(base.m_queryEnd), str, len, parseBuffer);
                  parse(parseBuffer.data(), &relative);
- #if PLATFORM(JAVA)
-             } else if(base.isJarFile()) {
-                 appendASCII(base.m_string.left(base.m_pathAfterLastSlash), str, len, parseBuffer);
-                 parse(parseBuffer.data(), &relative);
- #endif
              } else {
                  m_string = relative;
                  invalidate();
              }
              return;
--- 422,439 ----
      if (absolute) {
          parse(str, &relative);
      } else {
          // If the base is empty or opaque (e.g. data: or javascript:), then the URL is invalid
          // unless the relative URL is a single fragment.
+ #if PLATFORM(JAVA)
+         if (!base.isHierarchical() && !base.isJarFile()) {
+ #else
          if (!base.isHierarchical()) {
+ #endif
              if (str[0] == '#') {
                  appendASCII(base.m_string.left(base.m_queryEnd), str, len, parseBuffer);
                  parse(parseBuffer.data(), &relative);
              } else {
                  m_string = relative;
                  invalidate();
              }
              return;