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
dfb69a76
Commit
dfb69a76
authored
Oct 30, 2015
by
Christian Schudt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unnecessary semicolons.
parent
23d6aabc
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
18 additions
and
18 deletions
+18
-18
XMPPPacketReader.java
src/java/org/dom4j/io/XMPPPacketReader.java
+1
-1
MulticastRouter.java
src/java/org/jivesoftware/openfire/MulticastRouter.java
+1
-1
ClearspaceVCardTranslator.java
...ftware/openfire/clearspace/ClearspaceVCardTranslator.java
+2
-2
ConnectionException.java
...jivesoftware/openfire/clearspace/ConnectionException.java
+1
-1
ExternalComponentConfiguration.java
...re/openfire/component/ExternalComponentConfiguration.java
+1
-1
HistoryStrategy.java
src/java/org/jivesoftware/openfire/muc/HistoryStrategy.java
+1
-1
MUCEventDelegate.java
src/java/org/jivesoftware/openfire/muc/MUCEventDelegate.java
+1
-1
ClientTrustManager.java
...ava/org/jivesoftware/openfire/net/ClientTrustManager.java
+1
-1
MXParser.java
src/java/org/jivesoftware/openfire/net/MXParser.java
+1
-1
SASLAuthentication.java
...ava/org/jivesoftware/openfire/net/SASLAuthentication.java
+1
-1
TLSStatus.java
src/java/org/jivesoftware/openfire/net/TLSStatus.java
+1
-1
Node.java
src/java/org/jivesoftware/openfire/pubsub/Node.java
+1
-1
RemoteServerConfiguration.java
...vesoftware/openfire/server/RemoteServerConfiguration.java
+1
-1
RemoteServerManager.java
...org/jivesoftware/openfire/server/RemoteServerManager.java
+1
-1
JiveGlobals.java
src/java/org/jivesoftware/util/JiveGlobals.java
+1
-1
PropertyEventDispatcher.java
src/java/org/jivesoftware/util/PropertyEventDispatcher.java
+1
-1
XMLProperties.java
src/java/org/jivesoftware/util/XMLProperties.java
+1
-1
No files found.
src/java/org/dom4j/io/XMPPPacketReader.java
View file @
dfb69a76
...
@@ -428,7 +428,7 @@ public class XMPPPacketReader {
...
@@ -428,7 +428,7 @@ public class XMPPPacketReader {
}
}
default
:
default
:
{
{
;
}
}
}
}
}
}
...
...
src/java/org/jivesoftware/openfire/MulticastRouter.java
View file @
dfb69a76
...
@@ -446,6 +446,6 @@ public class MulticastRouter extends BasicModule implements ServerFeaturesProvid
...
@@ -446,6 +446,6 @@ public class MulticastRouter extends BasicModule implements ServerFeaturesProvid
/**
/**
* These addressees are the primary recipients of the stanza.
* These addressees are the primary recipients of the stanza.
*/
*/
to
;
to
}
}
}
}
src/java/org/jivesoftware/openfire/clearspace/ClearspaceVCardTranslator.java
View file @
dfb69a76
...
@@ -36,7 +36,7 @@ class ClearspaceVCardTranslator {
...
@@ -36,7 +36,7 @@ class ClearspaceVCardTranslator {
// Represents the type of action that was performed.
// Represents the type of action that was performed.
enum
Action
{
enum
Action
{
MODIFY
,
CREATE
,
UPDATE
,
DELETE
,
NO_ACTION
;
MODIFY
,
CREATE
,
UPDATE
,
DELETE
,
NO_ACTION
}
}
/**
/**
...
@@ -131,7 +131,7 @@ class ClearspaceVCardTranslator {
...
@@ -131,7 +131,7 @@ class ClearspaceVCardTranslator {
*/
*/
enum
VCardField
{
enum
VCardField
{
TITLE
,
ORG_ORGUNIT
,
ADR_WORK
,
ADR_HOME
,
EMAIL_USERID
,
EMAIL_PREF_USERID
,
FN
,
TITLE
,
ORG_ORGUNIT
,
ADR_WORK
,
ADR_HOME
,
EMAIL_USERID
,
EMAIL_PREF_USERID
,
FN
,
PHOTO_TYPE
,
PHOTO_BINVAL
,
URL
,
TZ
,
PHONE_HOME
,
PHONE_WORK
,
FAX_WORK
,
MOBILE_WORK
,
PAGER_WORK
;
PHOTO_TYPE
,
PHOTO_BINVAL
,
URL
,
TZ
,
PHONE_HOME
,
PHONE_WORK
,
FAX_WORK
,
MOBILE_WORK
,
PAGER_WORK
}
}
private
static
ClearspaceVCardTranslator
instance
=
new
ClearspaceVCardTranslator
();
private
static
ClearspaceVCardTranslator
instance
=
new
ClearspaceVCardTranslator
();
...
...
src/java/org/jivesoftware/openfire/clearspace/ConnectionException.java
View file @
dfb69a76
...
@@ -25,7 +25,7 @@ package org.jivesoftware.openfire.clearspace;
...
@@ -25,7 +25,7 @@ package org.jivesoftware.openfire.clearspace;
*/
*/
public
class
ConnectionException
extends
Exception
{
public
class
ConnectionException
extends
Exception
{
public
enum
ErrorType
{
AUTHENTICATION
,
PAGE_NOT_FOUND
,
UPDATE_STATE
,
UNKNOWN_HOST
,
SERVICE_NOT_AVAIBLE
,
OTHER
}
;
public
enum
ErrorType
{
AUTHENTICATION
,
PAGE_NOT_FOUND
,
UPDATE_STATE
,
UNKNOWN_HOST
,
SERVICE_NOT_AVAIBLE
,
OTHER
}
private
ErrorType
errorType
;
private
ErrorType
errorType
;
...
...
src/java/org/jivesoftware/openfire/component/ExternalComponentConfiguration.java
View file @
dfb69a76
...
@@ -77,6 +77,6 @@ public class ExternalComponentConfiguration {
...
@@ -77,6 +77,6 @@ public class ExternalComponentConfiguration {
/**
/**
* The XMPP entity is NOT allowed to connect to the server.
* The XMPP entity is NOT allowed to connect to the server.
*/
*/
blocked
;
blocked
}
}
}
}
src/java/org/jivesoftware/openfire/muc/HistoryStrategy.java
View file @
dfb69a76
...
@@ -255,7 +255,7 @@ public class HistoryStrategy {
...
@@ -255,7 +255,7 @@ public class HistoryStrategy {
*/
*/
public
enum
Type
{
public
enum
Type
{
defaulType
,
none
,
all
,
number
defaulType
,
none
,
all
,
number
}
;
}
/**
/**
* Obtain the strategy type from string name. See the Type enumeration name
* Obtain the strategy type from string name. See the Type enumeration name
...
...
src/java/org/jivesoftware/openfire/muc/MUCEventDelegate.java
View file @
dfb69a76
...
@@ -35,7 +35,7 @@ public abstract class MUCEventDelegate {
...
@@ -35,7 +35,7 @@ public abstract class MUCEventDelegate {
HANDLED_BY_DELEGATE
,
HANDLED_BY_DELEGATE
,
HANDLED_BY_OPENFIRE
,
HANDLED_BY_OPENFIRE
,
REJECTED
REJECTED
}
;
}
/**
/**
* This event will be triggered when an entity joins an existing room.
* This event will be triggered when an entity joins an existing room.
...
...
src/java/org/jivesoftware/openfire/net/ClientTrustManager.java
View file @
dfb69a76
...
@@ -141,7 +141,7 @@ public class ClientTrustManager implements X509TrustManager {
...
@@ -141,7 +141,7 @@ public class ClientTrustManager implements X509TrustManager {
Log
.
debug
(
"ClientTrustManager: Updating CRLs"
);
Log
.
debug
(
"ClientTrustManager: Updating CRLs"
);
useCRLs
=
false
;
useCRLs
=
false
;
try
{
try
{
CertificateFactory
cf
=
CertificateFactory
.
getInstance
(
"X.509"
);
;
CertificateFactory
cf
=
CertificateFactory
.
getInstance
(
"X.509"
);
X509CRL
crl
;
X509CRL
crl
;
...
...
src/java/org/jivesoftware/openfire/net/MXParser.java
View file @
dfb69a76
...
@@ -277,7 +277,7 @@ public class MXParser extends org.xmlpull.mxp1.MXParser {
...
@@ -277,7 +277,7 @@ public class MXParser extends org.xmlpull.mxp1.MXParser {
if
(
eventType
==
XmlPullParser
.
END_TAG
&&
if
(
eventType
==
XmlPullParser
.
END_TAG
&&
(
ch
==
' '
||
ch
==
'\n'
||
ch
==
'\t'
))
{
(
ch
==
' '
||
ch
==
'\n'
||
ch
==
'\t'
))
{
// ** ADDED CODE (INCLUDING IF STATEMENT)
// ** ADDED CODE (INCLUDING IF STATEMENT)
lastHeartbeat
=
System
.
currentTimeMillis
();
;
lastHeartbeat
=
System
.
currentTimeMillis
();
}
}
if
(
ch
==
']'
)
{
if
(
ch
==
']'
)
{
if
(
seenBracket
)
{
if
(
seenBracket
)
{
...
...
src/java/org/jivesoftware/openfire/net/SASLAuthentication.java
View file @
dfb69a76
...
@@ -162,7 +162,7 @@ public class SASLAuthentication {
...
@@ -162,7 +162,7 @@ public class SASLAuthentication {
/**
/**
* SASL negotiation has been successful.
* SASL negotiation has been successful.
*/
*/
authenticated
;
authenticated
}
}
/**
/**
...
...
src/java/org/jivesoftware/openfire/net/TLSStatus.java
View file @
dfb69a76
...
@@ -53,5 +53,5 @@ public enum TLSStatus {
...
@@ -53,5 +53,5 @@ public enum TLSStatus {
/**
/**
* Handshaking is OK.
* Handshaking is OK.
*/
*/
OK
;
OK
}
}
src/java/org/jivesoftware/openfire/pubsub/Node.java
View file @
dfb69a76
...
@@ -2309,5 +2309,5 @@ public abstract class Node {
...
@@ -2309,5 +2309,5 @@ public abstract class Node {
* Dynamically specify a replyto of the item publisher.
* Dynamically specify a replyto of the item publisher.
*/
*/
publisher
publisher
}
;
}
}
}
src/java/org/jivesoftware/openfire/server/RemoteServerConfiguration.java
View file @
dfb69a76
...
@@ -103,6 +103,6 @@ public class RemoteServerConfiguration implements Cacheable, Externalizable {
...
@@ -103,6 +103,6 @@ public class RemoteServerConfiguration implements Cacheable, Externalizable {
/**
/**
* The XMPP entity is NOT allowed to connect to the server.
* The XMPP entity is NOT allowed to connect to the server.
*/
*/
blocked
;
blocked
}
}
}
}
src/java/org/jivesoftware/openfire/server/RemoteServerManager.java
View file @
dfb69a76
...
@@ -383,6 +383,6 @@ public class RemoteServerManager {
...
@@ -383,6 +383,6 @@ public class RemoteServerManager {
* Only the XMPP entities listed in the <b>allowed list</b> are able to connect to
* Only the XMPP entities listed in the <b>allowed list</b> are able to connect to
* the server.
* the server.
*/
*/
whitelist
;
whitelist
}
}
}
}
src/java/org/jivesoftware/util/JiveGlobals.java
View file @
dfb69a76
...
@@ -1130,7 +1130,7 @@ public class JiveGlobals {
...
@@ -1130,7 +1130,7 @@ public class JiveGlobals {
openfireProperties
.
setProperty
(
propertyName
,
openfireProps
.
get
(
propertyName
));
openfireProperties
.
setProperty
(
propertyName
,
openfireProps
.
get
(
propertyName
));
}
else
if
(!
resetProperty
(
propertyName
))
{
}
else
if
(!
resetProperty
(
propertyName
))
{
Log
.
warn
(
"Failed to reset encrypted property value for "
+
propertyName
);
Log
.
warn
(
"Failed to reset encrypted property value for "
+
propertyName
);
}
;
}
}
}
securityProperties
.
deleteProperty
(
ENCRYPTION_KEY_NEW
);
securityProperties
.
deleteProperty
(
ENCRYPTION_KEY_NEW
);
securityProperties
.
deleteProperty
(
ENCRYPTION_KEY_OLD
);
securityProperties
.
deleteProperty
(
ENCRYPTION_KEY_OLD
);
...
...
src/java/org/jivesoftware/util/PropertyEventDispatcher.java
View file @
dfb69a76
...
@@ -136,6 +136,6 @@ public class PropertyEventDispatcher {
...
@@ -136,6 +136,6 @@ public class PropertyEventDispatcher {
/**
/**
* An XML property was deleted.
* An XML property was deleted.
*/
*/
xml_property_deleted
;
xml_property_deleted
}
}
}
}
\ No newline at end of file
src/java/org/jivesoftware/util/XMLProperties.java
View file @
dfb69a76
...
@@ -745,7 +745,7 @@ public class XMLProperties {
...
@@ -745,7 +745,7 @@ public class XMLProperties {
}
}
boolean
error
=
false
;
boolean
error
=
false
;
// Write data out to a temporary file first.
// Write data out to a temporary file first.
File
tempFile
=
new
File
(
file
.
getParentFile
(),
file
.
getName
()
+
".tmp"
);
;
File
tempFile
=
new
File
(
file
.
getParentFile
(),
file
.
getName
()
+
".tmp"
);
try
(
Writer
writer
=
new
BufferedWriter
(
new
OutputStreamWriter
(
new
FileOutputStream
(
tempFile
),
StandardCharsets
.
UTF_8
)))
{
try
(
Writer
writer
=
new
BufferedWriter
(
new
OutputStreamWriter
(
new
FileOutputStream
(
tempFile
),
StandardCharsets
.
UTF_8
)))
{
OutputFormat
prettyPrinter
=
OutputFormat
.
createPrettyPrint
();
OutputFormat
prettyPrinter
=
OutputFormat
.
createPrettyPrint
();
XMLWriter
xmlWriter
=
new
XMLWriter
(
writer
,
prettyPrinter
);
XMLWriter
xmlWriter
=
new
XMLWriter
(
writer
,
prettyPrinter
);
...
...
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