Author: kwright
Date: Tue Nov 4 13:04:02 2014
New Revision: 1636572
URL: http://svn.apache.org/r1636572
Log:
Pull up second fix for CONNECTORS-1090 from dev_1x branch
Modified:
manifoldcf/branches/release-1.7-branch/ (props changed)
manifoldcf/branches/release-1.7-branch/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/JoinClause.java
Propchange: manifoldcf/branches/release-1.7-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/dev_1x:r1636571
Merged /manifoldcf/trunk:r1636570
Modified:
manifoldcf/branches/release-1.7-branch/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/JoinClause.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.7-branch/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/JoinClause.java?rev=1636572&r1=1636571&r2=1636572&view=diff
==============================================================================
---
manifoldcf/branches/release-1.7-branch/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/JoinClause.java
(original)
+++
manifoldcf/branches/release-1.7-branch/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/JoinClause.java
Tue Nov 4 13:04:02 2014
@@ -38,7 +38,7 @@ public class JoinClause implements Claus
{
this.columnName = columnName;
this.joinColumnName = joinColumnName;
- this.operation = "=";
+ this.operation = operation;
}
/** Get the column name */