-
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into fileDirPattern
* upstream/master: (36 commits) Rework DBLPFetcher to new structure (#2314) Consider dev tag in version comparison (#2312) Update diffutils from 1.3.0 to 2.1.1 Replace usages of Throwable with Exception (#2310) Add missing srcDir statement improve documentation of save order limitation - see #2305 Adapt CSL tests to CRLF and LF (#2306) Use SPDX license identifiers Add key format of #2275 as requirement to CONTRIBUTING.md Add fallback exception handler (#2287) Update citeproc dependency to 1.0.1 (#2303) Remove duplicate code getResolvedFieldOrAlias (#2296) Update testCompile dependencies (mockito-core, wiremock) Change execution order (#2302) Use https for files.jabref.org Use compileJava instead of getdeps to decrease build time even more Update install4j from 6.1.1 to 6.1.3 Fix local metadata synchronization Fix NullPointerException in ConnectToSharedDatabaseDialog (#2297) The error message "No suitable driver found" will not appear when JabRef connects on startup. (#2295) ... # Conflicts: # src/main/java/net/sf/jabref/logic/util/io/FileUtil.java
- Loading branch information
Showing
80 changed files
with
731 additions
and
661 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
#Tue Oct 11 00:24:20 CEST 2016 | ||
#Tue Nov 15 06:45:23 CET 2016 | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-bin.zip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
package net.sf.jabref; | ||
|
||
import org.apache.logging.log4j.LogManager; | ||
import org.apache.logging.log4j.Logger; | ||
import org.apache.logging.log4j.Marker; | ||
import org.apache.logging.log4j.MarkerManager; | ||
|
||
/** | ||
* Catch and log any unhandled exceptions. | ||
*/ | ||
public class FallbackExceptionHandler implements Thread.UncaughtExceptionHandler { | ||
|
||
private static final Marker UncaughtException_MARKER = MarkerManager.getMarker("UncaughtException"); | ||
|
||
public static void installExceptionHandler() { | ||
Thread.setDefaultUncaughtExceptionHandler(new FallbackExceptionHandler()); | ||
} | ||
|
||
@Override | ||
public void uncaughtException(Thread thread, Throwable exception) { | ||
Logger logger = LogManager.getLogger(FallbackExceptionHandler.class); | ||
logger.error(UncaughtException_MARKER, "Uncaught exception Occurred in " + thread, exception); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.