Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of https://github.com/wonlay/sensei into activi…

…ty_final
  • Loading branch information...
commit a3297a735ffbe8949d7543248e279a35bc2e4473 2 parents 26e5403 + 63efdf5
Volodymyr Zhabiuk authored
View
8 sensei-core/pom.xml
@@ -197,7 +197,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
- <version>2.5.6</version>
+ <version>2.5.5</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -229,7 +229,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.1</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
@@ -297,9 +297,9 @@
</dependency>
<dependency>
- <groupId>javassist</groupId>
+ <groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.12.1.GA</version>
+ <version>3.16.1-GA</version>
</dependency>
</dependencies>
</project>
View
2  sensei-core/src/main/java/com/senseidb/dataprovider/http/HttpStreamDataProvider.java
@@ -239,7 +239,7 @@ public void setStartingOffset(String initialOffset){
}
DataEvent<D> data = null;
- if (_currentDataIter.hasNext()){
+ if (_currentDataIter != null && _currentDataIter.hasNext()) {
data = _currentDataIter.next();
if (data!=null){
_offset = data.getVersion();
View
10 sensei-core/src/main/java/com/senseidb/servlet/AbstractSenseiClientServlet.java
@@ -256,7 +256,10 @@ private void handleSenseiRequest(HttpServletRequest req, HttpServletResponse res
{
if (queryLogger.isInfoEnabled())
{
- queryLogger.info("bql=" + bqlStmt);
+ if (jsonObj.length() == 1)
+ queryLogger.info("bql=" + bqlStmt);
+ else
+ queryLogger.info("query=" + content);
}
compiledJson = _compiler.compile(bqlStmt);
}
@@ -290,11 +293,6 @@ private void handleSenseiRequest(HttpServletRequest req, HttpServletResponse res
JSONObject predObj = null;
if (extraFilter.length() > 0)
{
- if (queryLogger.isInfoEnabled())
- {
- queryLogger.info("BQL extra filter: " + extraFilter);
- }
-
String bql2 = "SELECT * WHERE " + extraFilter;
try
{
View
4 sensei-parent/pom.xml
@@ -9,11 +9,11 @@
<description>sensei search</description>
<url>http://www.senseidb.com/</url>
- <!-- parent>
+ <parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>6</version>
- </parent -->
+ </parent>
<inceptionYear>2010</inceptionYear>
Please sign in to comment.
Something went wrong with that request. Please try again.