Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
Conflicts:
	src/main/java/com/jcabi/jdbc/ColumnOutcome.java
	src/main/java/com/jcabi/jdbc/PrepareArgs.java
	src/main/java/com/jcabi/jdbc/SingleOutcome.java
  • Loading branch information
mj1618 committed Feb 17, 2015
2 parents 0955e01 + 4878681 commit 6105fbc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/main/java/com/jcabi/jdbc/SingleOutcome.java
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public SingleOutcome(
if (tpe.equals(String.class) || tpe.equals(Long.class)
|| tpe.equals(Boolean.class) || tpe.equals(Byte.class)
|| tpe.equals(Date.class) || tpe.equals(Utc.class)
|| tpe.equals(byte[].class)
|| byte[].class.equals(tpe)
) {
this.type = tpe.getName();
} else {
Expand Down

0 comments on commit 6105fbc

Please sign in to comment.