Skip to content

Commit

Permalink
8259232: Bad JNI lookup during printing
Browse files Browse the repository at this point in the history
Reviewed-by: psadhukhan
  • Loading branch information
prrace committed Jan 6, 2021
1 parent df721f0 commit 940b053
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Expand Up @@ -58,7 +58,7 @@

#define GET_CPRINTERDIALOG_METHOD_RETURN(ret) \
GET_CPRINTERDIALOG_CLASS_RETURN(ret); \
GET_METHOD_RETURN(sjm_printerJob, sjc_CPrinterDialog, "fPrinterJob", "Lsun/lwawt/macosx/CPrinterJob;", ret);
GET_FIELD_RETURN(sjm_printerJob, sjc_CPrinterDialog, "fPrinterJob", "Lsun/lwawt/macosx/CPrinterJob;", ret);

static NSPrintInfo* createDefaultNSPrintInfo();

Expand Down
2 changes: 1 addition & 1 deletion test/jdk/java/awt/print/bug8023392/bug8023392.java
Expand Up @@ -23,7 +23,7 @@

/*
test
@bug 8023392
@bug 8023392 8259232
@summary Swing text components printed with spaces between chars
@author Anton Nashatyrev
@run applet/manual=yesno bug8023392.html
Expand Down

3 comments on commit 940b053

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@VladimirKempik
Copy link

Choose a reason for hiding this comment

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

/backport jdk15u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 940b053 Apr 15, 2021

Choose a reason for hiding this comment

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

@VladimirKempik could not automatically backport 940b0530 to openjdk/jdk15u-dev due to conflicts in the following files:

  • src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m

To manually resolve these conflicts run the following commands in your personal fork of openjdk/jdk15u-dev:

$ git checkout -b backport-940b0530
$ git fetch --no-tags https://git.openjdk.java.net/jdk 940b053065de788e44ef0d7f6fab901f8f0dfb40
$ git cherry-pick --no-commit 940b053065de788e44ef0d7f6fab901f8f0dfb40
$ # Resolve conflicts
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 940b053065de788e44ef0d7f6fab901f8f0dfb40'

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

Please sign in to comment.