Skip to content

Fixes core#336 - hystrix java maven problem #111

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.

Sign up for GitHub

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

Open
luan-cestari wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes core#336 - hystrix java maven problem #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd09a7b
Merge remote-tracking branch 'upstream/master'
luan-cestari Mar 4, 2015
3abc455
Changes necessary as we updated the Hystrix version (from RC to relea…
luan-cestari Mar 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions hystrix/src/main/java/com/redhat/lightblue/hystrix/rdbms/ExecuteSQLCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,6 @@ public ExecuteSQLCommand(RDBMSContext<T> rdbmsContext, List<SelectStmt> inputStm
this.inputStmt = inputStmt;
}

/**
* Unwrap hystrix exception
*/
@Override
public Void execute() {
try {
return super.execute();
} catch (HystrixBadRequestException br) {
throw (RuntimeException) br.getCause();
} catch (RuntimeException x) {
throw x;
}
}

@Override
protected Void run() {
try {
Expand Down
6 changes: 6 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,12 @@
<sonar.jdbc.password>sonar</sonar.jdbc.password>
<sonar.host.url>http://127.0.0.1:8080</sonar.host.url>
<sonar.projectName>lightblue-rdbms</sonar.projectName>


<maven.compiler.showWarnings>true</maven.compiler.showWarnings>
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
<maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel>
<maven.compiler.verbose>true</maven.compiler.verbose>
</properties>
<build>
<plugins>
Expand Down