Permalink
Browse files

Merge branch 'master' of github.com:vzhabiuk/zoie

Conflicts:
	zoie-core/src/main/java/proj/zoie/api/ZoieSegmentReader.java
  • Loading branch information...
2 parents 44b5f9b + 9911f33 commit 0a6feda4a9a131eee7c7e6ab976abea1cf896430 vzhabiuk committed Jan 31, 2012
@@ -1,4 +1,4 @@
-#Thu Jan 07 19:18:12 PST 2010
+#Mon Jan 02 15:43:25 PST 2012
eclipse.preferences.version=1
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
@@ -340,7 +340,7 @@ public void decRef() throws IOException {
// not synchronized, since it doesn't do anything anyway
}
@Override
- public int numDocs() {
+ public int numDocs() {
if (_currentDelDocIds != null) {
return super.numDocs() - _currentDelDocIds.length;
} else {

0 comments on commit 0a6feda

Please sign in to comment.