CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-07-03 21:07:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into i1169

Browse Source
This commit is contained in:
Timo Westkämper 2015-02-08 10:08:49 +02:00
commit eef506a2ca
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
querydsl-core/src/main/java/com/querydsl/core/support/ReplaceVisitor.java
View File

@ -15,8 +15,8 @@ package com.querydsl.core.support;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.querydsl.core.*;
import com.querydsl.core.types.*;
@ -71,7 +71,7 @@ public class ReplaceVisitor<C> implements Visitor<Expression<?>, C> {
if (element instanceof Expression<?>) {
element = ((Expression) element).accept(this, context);
}
if (parent.equals(metadata.getParent()) && Objects.equals(element, metadata.getElement())) {
if (parent.equals(metadata.getParent()) && Objects.equal(element, metadata.getElement())) {
return expr;
} else {
metadata = new PathMetadata(parent, element, metadata.getPathType());

2
querydsl-sql/src/main/java/com/querydsl/sql/support/JaveSE7SQLExceptionWrapper.java → querydsl-sql/src/main/java/com/querydsl/sql/support/JavaSE7SQLExceptionWrapper.java
View File

@ -23,7 +23,7 @@ import com.querydsl.core.QueryException;
*
* @author Shredder121
*/
class JaveSE7SQLExceptionWrapper extends SQLExceptionWrapper {
class JavaSE7SQLExceptionWrapper extends SQLExceptionWrapper {
@Override
public RuntimeException wrap(SQLException exception) {

2
querydsl-sql/src/main/java/com/querydsl/sql/support/SQLExceptionWrapper.java
View File

@ -35,7 +35,7 @@ public abstract class SQLExceptionWrapper {
double javaVersion
= Double.parseDouble(JAVA_SPECIFICATION_VERSION.value());
if (javaVersion > 1.6) {
INSTANCE = new JaveSE7SQLExceptionWrapper();
INSTANCE = new JavaSE7SQLExceptionWrapper();
} else {
INSTANCE = new JavaSE6SQLExceptionWrapper();
}