Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Send all cache notification when error one not find. #16

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Send all cache notification when error one not find. #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e07dbc
Send all cache notification when error one not find.
May 15, 2015
1645262
Deal with the apple close the connection
May 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/main/java/com/dbay/apns4j/impl/ApnsConnectionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,12 +182,7 @@ public void sendNotification(PushNotification notification) {

notificationCachedQueue.add(notification);
lastSuccessfulTime = System.currentTimeMillis();

/** TODO there is a bug, maybe, theoretically.
* CN: 假如我们发了一条错误的通知，然后又发了 maxCacheLength 条正确的通知。这时APNS服务器
* 才返回第一条通知的error-response。此时，第一条通知已经从队列移除了。。
* 其实后面100条该重发，但却没有。不过这个问题的概率很低，我们还是信任APNS服务器能及时返回
*/

if (notificationCachedQueue.size() > maxCacheLength) {
notificationCachedQueue.poll();
}
Expand Down Expand Up @@ -269,7 +264,7 @@ public void run() {
/** EN: error-response,close the socket and resent notifications
* CN: 一旦遇到错误返回就关闭连接，并且重新发送在它之后发送的通知
*/
if (size == res.length && command == Command.ERROR) {
if (size == res.length && (command == Command.INVALID_TOKEN || command == Command.SHUTDOWN)) {
int status = res[1];
int errorId = ApnsTools.parse4ByteInt(res[2], res[3], res[4], res[5]);

Expand Down Expand Up @@ -298,6 +293,10 @@ public void run() {
}
}
if (!found) {
/* It means the error one already out of the queue, all notification should add in resent queue. */
resentQueue.addAll(notificationCachedQueue);
notificationCachedQueue.clear();
/* Maybe there should auto increase maxCacheLength . */
logger.warn(connName + " Didn't find error-notification in the queue. Maybe it's time to adjust cache length. id: " + errorId);
}
}
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/dbay/apns4j/model/Command.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,7 @@ public class Command {

public static final int SEND_V2 = 2;

public static final int ERROR = 8;
public static final int INVALID_TOKEN = 8;

public static final int SHUTDOWN = 10;
}