ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-28 16:58:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Squashed commit of the following: (#39)

Browse Source 
commit 0347a6da462f724011c4078e9551800fa6455c56
Author: Joel Dice <joel.dice@gmail.com>
Date:   Mon Sep 11 10:49:39 2017 -0600

    attempt to fix Travis-CI build regression linked to Trusty upgrade

commit 06cae8a63c9a9b986b75d25b87af5e5a7610e0e5
Merge: 0056f2885 e94b191e6
Author: Joel Dice <joel.dice@gmail.com>
Date:   Mon Sep 11 10:41:58 2017 -0600

    Merge pull request #548 from corda/chrisr3-log-uncaught-exceptions

    Allow any uncaught exception to be logged as the thread exits.

commit 0056f2885285de374464436a9d6a6cea3a0e3c1b
Merge: a25c09bb7 7b3bedf0a
Author: Joel Dice <joel.dice@gmail.com>
Date:   Mon Sep 11 10:39:57 2017 -0600

    Merge pull request #549 from seanhenry/fix-string-builder

    Changes return type to StringBuilder

commit 7b3bedf0a4d16d837ec97cdac10dd86aef82953e
Author: Sean Henry <hello@seanhenry.codes>
Date:   Sun Sep 10 09:00:09 2017 -0700

    Changes return type to StringBuilder

commit e94b191e6dd83d86775079fa3dff218f7fe53005
Author: Chris Rankin <chris.rankin@r3.com>
Date:   Wed Sep 6 10:38:34 2017 +0100

    Allow any uncaught exception to be logged as the thread exits.
This commit is contained in:
Chris Rankin 2017-09-11 22:41:06 +01:00 committed by GitHub
parent 53ebea8d29
commit 56c7c91fee
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgx-jvm/avian/classpath/java/lang/StringBuilder.java
View File

@ -62,7 +62,7 @@ public class StringBuilder implements CharSequence, Appendable {
return append(sequence.toString());
}
public Appendable append(CharSequence sequence, int start, int end) {
public StringBuilder append(CharSequence sequence, int start, int end) {
return append(sequence.subSequence(start, end));
}

4
sgx-jvm/avian/makefile
View File

@ -4,7 +4,7 @@ name = avian
version := $(shell grep version gradle.properties | cut -d'=' -f2)
java-version := $(shell "$(JAVA_HOME)/bin/java" -version 2>&1 \
| head -n 1 \
| grep 'version "1' \
| sed 's/.*version "1.\([^.]*\).*/\1/')
build-arch := $(shell uname -m \
@ -172,7 +172,7 @@ library-path = $(library-path-variable)=$(build)
ifneq ($(openjdk),)
openjdk-version := $(shell $(openjdk)/bin/java -version 2>&1 \
| head -n 1 \
| grep 'version "1' \
| sed 's/.*version "1.\([^.]*\).*/\1/')
openjdk-arch = $(arch)

4
sgx-jvm/avian/src/classpath-openjdk.cpp
View File

@ -979,10 +979,6 @@ void uncaughtException(Thread *t, GcThrowable *e)
if (dispatch != NULL) {
THREAD_RESOURCE0(t, {
if (t->exception != NULL) {
// We ignore any exceptions from the uncaught
// exception handler itself.
t->exception = NULL;
// The stack will be unwound when this resource is
// released, which means that uncaughtException()
// will not return. So repeat the thread clean-up here.

3
sgx-jvm/avian/test/ci.sh
View File

@ -71,6 +71,9 @@ has_flag() {
### START ###
echo "java version:"
${JAVA_HOME}/bin/java -version
install-deps
if [[ "${1}" == "PUBLISH" ]]; then