Skip to content

Commit

Permalink
8307135: java/awt/dnd/NotReallySerializableTest/NotReallySerializable…
Browse files Browse the repository at this point in the history 
…Test.java failed

Reviewed-by: jiefu, prr
  • Loading branch information
@mrserb
mrserb committed Apr 29, 2023
1 parent 1f68924 commit d43a5a2
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion test/jdk/java/awt/dnd/NotReallySerializableTest/NotReallySerializableTest.java
View file
Expand Up @@ -23,6 +23,7 @@

/*
@test
@key headful
@bug 4187912
@summary Test that some incorrectly written DnD code cannot hang the app
@run main NotReallySerializableTest
Expand Down Expand Up @@ -116,4 +117,4 @@ class TrickDropTargetListener extends DropTargetAdapter
Object trick = new Object();

public void drop(DropTargetDropEvent dtde) {}
}
}

4 comments on commit d43a5a2

@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

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 d43a5a2 May 25, 2023

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-d43a5a28 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 d43a5a28 from the openjdk/jdk repository.

The commit being backported was authored by Sergey Bylokhov on 29 Apr 2023 and was reviewed by Jie Fu and Phil Race.

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.git MBaesken-backport-d43a5a28:MBaesken-backport-d43a5a28
$ git checkout MBaesken-backport-d43a5a28
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git MBaesken-backport-d43a5a28

@openjdk
Copy link

@openjdk openjdk bot commented on d43a5a2 Jul 25, 2023

Choose a reason for hiding this comment

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

@mrserb Could not automatically backport d43a5a28 to openjdk/jdk11u-dev due to conflicts in the following files:

  • test/jdk/java/awt/dnd/NotReallySerializableTest/NotReallySerializableTest.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk11u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk11u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b mrserb-backport-d43a5a28

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git d43a5a289f4ac84480bf54ab304c1ce1dbc8e067

# Backport the commit
$ git cherry-pick --no-commit d43a5a289f4ac84480bf54ab304c1ce1dbc8e067
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport d43a5a289f4ac84480bf54ab304c1ce1dbc8e067'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport d43a5a289f4ac84480bf54ab304c1ce1dbc8e067.

Please sign in to comment.