New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BUG534065 - ECLIPSE GETOBJECTFROMRESULTSET ON APPS.XMLTYPE DATA CAUSE… #116

Merged
merged 3 commits into from Jun 12, 2018

Conversation

Projects
None yet
3 participants
@rtummuru
Contributor

rtummuru commented Jun 6, 2018

Fixes #534065 ECLIPSE GETOBJECTFROMRESULTSET ON APPS.XMLTYPE DATA CAUSES NULLPOINTEREXCEPTION

@dazey3

dazey3 approved these changes Jun 7, 2018

It'd be nice if there was a test for this, but the change is pretty innocuous. Looks good!

@dazey3

This comment has been minimized.

Show comment
Hide comment
@dazey3

dazey3 Jun 7, 2018

Contributor

Oh, I just realized this change is in org.eclipse.persistence.oracle. I think @lukasj has to build new Oracle binaries and pull them in to get this change in

Contributor

dazey3 commented Jun 7, 2018

Oh, I just realized this change is in org.eclipse.persistence.oracle. I think @lukasj has to build new Oracle binaries and pull them in to get this change in

@lukasj

This comment has been minimized.

Show comment
Hide comment
@lukasj

lukasj Jun 12, 2018

Contributor

Cannot merge this with no sign-off.

Contributor

lukasj commented Jun 12, 2018

Cannot merge this with no sign-off.

@dazey3

This comment has been minimized.

Show comment
Hide comment
@dazey3

dazey3 Jun 12, 2018

Contributor

Good catch @lukasj ! Check out Pushing changes to your fork for information signing off on your commit. I would also suggest squashing your two commits into one as well (git rebase master -i)

Contributor

dazey3 commented Jun 12, 2018

Good catch @lukasj ! Check out Pushing changes to your fork for information signing off on your commit. I would also suggest squashing your two commits into one as well (git rebase master -i)

@rtummuru

This comment has been minimized.

Show comment
Hide comment
@rtummuru

rtummuru Jun 12, 2018

Contributor
Contributor

rtummuru commented Jun 12, 2018

@lukasj

This comment has been minimized.

Show comment
Hide comment
@lukasj

lukasj Jun 12, 2018

Contributor

@rtummuru make sure your local repo is in sync by git reset --hard HEAD~4 && git pull -r (this will wipe out all your local modifications)

Once your repo is in sync, make sure that:
git config --get user.name returns your name
git config --get user.email returns your email

Then:

  • Fix copyright year from 2017 to 2018 in the file you're updating (Oracle9Platform.java).
  • commit the change using git commit -s -a -m "fix copyright"
  • run git log -1 and verify that the output ends with Signed-off-by: ...
  • if it does not then run git rebase -i and add the line to the commit message manually
  • if it does (or you fixed it) then do git push (DO NOT USE -f option)
Contributor

lukasj commented Jun 12, 2018

@rtummuru make sure your local repo is in sync by git reset --hard HEAD~4 && git pull -r (this will wipe out all your local modifications)

Once your repo is in sync, make sure that:
git config --get user.name returns your name
git config --get user.email returns your email

Then:

  • Fix copyright year from 2017 to 2018 in the file you're updating (Oracle9Platform.java).
  • commit the change using git commit -s -a -m "fix copyright"
  • run git log -1 and verify that the output ends with Signed-off-by: ...
  • if it does not then run git rebase -i and add the line to the commit message manually
  • if it does (or you fixed it) then do git push (DO NOT USE -f option)
fix copyright
Signed-off-by: Ravi Babu Tummuru <ravi.babu.tummuru@oracle.com>

@lukasj lukasj merged commit 7a6f673 into eclipse-ee4j:master Jun 12, 2018

0 of 2 checks passed

ip-validation The pull request did not pass Eclipse validation. The following users do not have valid ECAs. Please see <a href="https://www.eclipse.org...
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details

@rtummuru rtummuru deleted the rtummuru:BUG_534065 branch Jun 14, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment