usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mru...@apache.org
Subject [5/5] usergrid git commit: Fix issue in older 2.0 codebase.
Date Tue, 02 Feb 2016 16:53:26 GMT
Fix issue in older 2.0 codebase.


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/23c4e342
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/23c4e342
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/23c4e342

Branch: refs/heads/2.0-patch
Commit: 23c4e34257003a3b565e6a75f19dcdc6c6ffce98
Parents: 5732dee
Author: Michael Russo <michaelarusso@gmail.com>
Authored: Tue Feb 2 08:52:55 2016 -0800
Committer: Michael Russo <michaelarusso@gmail.com>
Committed: Tue Feb 2 08:52:55 2016 -0800

----------------------------------------------------------------------
 .../serialization/impl/MvccEntitySerializationStrategyImpl.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/23c4e342/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
index 6badbc1..b4adb0c 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
@@ -75,7 +75,8 @@ import rx.schedulers.Schedulers;
 /**
  * @author tnine
  */
-public abstract class MvccEntitySerializationStrategyImpl implements MvccEntitySerializationStrategy
{
+public abstract class
+MvccEntitySerializationStrategyImpl implements MvccEntitySerializationStrategy {
 
     private static final Logger log = LoggerFactory.getLogger( MvccLogEntrySerializationStrategyImpl.class
);
 
@@ -200,7 +201,7 @@ public abstract class MvccEntitySerializationStrategyImpl implements MvccEntityS
                             final List<ScopedRowKey<CollectionPrefixedKey<Id>>>
scopedRowKeys ) {
 
                             try {
-                                return keyspace.prepareQuery( columnFamily ).getKeySlice(
rowKeys )
+                                return keyspace.prepareQuery( columnFamily ).getKeySlice(
scopedRowKeys )
                                                               .withColumnRange( maxVersion,
null, false,
                                                                       1 ).execute().getResult();
                             }


Mime
View raw message