Merge branch 'develop' of ssh://den.jabber.ru:2205/var/lib/git/com.juick.api into develop

1 files changed, 6 insertions, 4 deletions

diff --git a/src/main/java/com/juick/api/Others.java b/src/main/java/com/juick/api/Others.java
index 5e5c7475..323ed41a 100644
--- a/src/main/java/com/juick/api/Others.java
+++ b/src/main/java/com/juick/api/Others.java
@@ -1,13 +1,15 @@
 package com.juick.api;
 
+import com.juick.User;
 import com.juick.json.UserSerializer;
 import com.juick.server.PMQueries;
-import java.io.IOException;
-import java.sql.Connection;
-import java.util.ArrayList;
+
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.sql.Connection;
+import java.util.List;
 
 /**
  *
@@ -37,7 +39,7 @@ public class Others {
         } catch (Exception e) {
         }
 
-        ArrayList<com.juick.User> lastconv = PMQueries.getPMLastConversationsUsers(sql, vuid, cnt);
+        List<User> lastconv = PMQueries.getPMLastConversationsUsers(sql, vuid, cnt);
         if (lastconv != null && !lastconv.isEmpty()) {
             String json = "{\"pms\":" + userSerializer.serializeList(lastconv) + "}";
             Main.replyJSON(request, response, json);