Skip to content

Commit

Permalink
8280373: Update Xalan serializer / SystemIDResolver to align with JDK…
Browse files Browse the repository at this point in the history 
…-8270492

Reviewed-by: yan, joehw
  • Loading branch information
@MBaesken
MBaesken committed Jan 26, 2022
1 parent a24f44d commit c180070
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions ....xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/*
* reserved comment block
* DO NOT REMOVE OR ALTER!
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Expand Down Expand Up @@ -42,6 +41,8 @@
* used in com.sun.org.apache.xml.internal.serializer.
*
* @xsl.usage internal
*
* @LastModified: Jan 2022
*/
public final class SystemIDResolver
{
Expand Down Expand Up @@ -282,7 +283,7 @@ public static String getAbsoluteURI(String systemId)
public static String getAbsoluteURI(String urlString, String base)
throws TransformerException
{
if (base == null)
if (base == null || base.length() == 0)
return getAbsoluteURI(urlString);

String absoluteBase = getAbsoluteURI(base);
Expand Down

5 comments on commit c180070

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

@MBaesken
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on c180070 Feb 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MBaesken the backport was successfully created on the branch MBaesken-backport-c180070c in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit c180070c from the openjdk/jdk repository.

The commit being backported was authored by Matthias Baesken on 26 Jan 2022 and was reviewed by Yuri Nesterenko and Joe Wang.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev MBaesken-backport-c180070c:MBaesken-backport-c180070c
$ git checkout MBaesken-backport-c180070c
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev MBaesken-backport-c180070c

@gnu-andrew
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on c180070 Apr 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gnu-andrew the backport was successfully created on the branch gnu-andrew-backport-c180070c in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit c180070c from the openjdk/jdk repository.

The commit being backported was authored by Matthias Baesken on 26 Jan 2022 and was reviewed by Yuri Nesterenko and Joe Wang.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev:

$ git fetch https://github.com/openjdk-bots/jdk11u-dev gnu-andrew-backport-c180070c:gnu-andrew-backport-c180070c
$ git checkout gnu-andrew-backport-c180070c
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk11u-dev gnu-andrew-backport-c180070c

Please sign in to comment.