Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
Openfire
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Openfire
Commits
d29ef7e2
Commit
d29ef7e2
authored
Dec 01, 2015
by
Guus der Kinderen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix NPE when no packets were queued before start or fail of new session.
parent
a0ce00e5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
LocalOutgoingServerProxy.java
...ivesoftware/openfire/server/LocalOutgoingServerProxy.java
+2
-2
No files found.
src/java/org/jivesoftware/openfire/server/LocalOutgoingServerProxy.java
View file @
d29ef7e2
...
...
@@ -131,7 +131,7 @@ public class LocalOutgoingServerProxy implements RoutableChannelHandler {
log
.
debug
(
"Spun up new session to {}"
,
domain
.
toString
());
int
sent
=
0
;
this
.
session
=
session
;
while
(!
this
.
packets
.
isEmpty
())
{
while
(
this
.
packets
!=
null
&&
!
this
.
packets
.
isEmpty
())
{
Packet
packet
=
this
.
packets
.
remove
();
this
.
session
.
process
(
packet
);
sent
=
sent
+
1
;
...
...
@@ -143,7 +143,7 @@ public class LocalOutgoingServerProxy implements RoutableChannelHandler {
protected
synchronized
void
sessionFailed
()
{
isTrying
=
false
;
log
.
debug
(
"Failed to spin up new session to {}"
,
domain
.
toString
());
while
(!
this
.
packets
.
isEmpty
())
{
while
(
this
.
packets
!=
null
&&
!
this
.
packets
.
isEmpty
())
{
Packet
packet
=
this
.
packets
.
remove
();
LocalSession
.
returnErrorToSender
(
packet
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment