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
64b3af11
Commit
64b3af11
authored
Jan 19, 2015
by
linuschien
Committed by
Guus der Kinderen
Dec 16, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
The result date should be the startDate for the remain cases.
parent
d62fe85c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
11 deletions
+4
-11
JdbcPersistenceManager.java
.../openfire/plugin/archive/impl/JdbcPersistenceManager.java
+4
-11
No files found.
src/plugins/monitoring/src/java/com/reucon/openfire/plugin/archive/impl/JdbcPersistenceManager.java
View file @
64b3af11
...
@@ -95,7 +95,6 @@ public class JdbcPersistenceManager implements PersistenceManager {
...
@@ -95,7 +95,6 @@ public class JdbcPersistenceManager implements PersistenceManager {
public
static
final
String
CONVERSATION_WITH_JID
=
"ofMessageArchive.toJID"
;
public
static
final
String
CONVERSATION_WITH_JID
=
"ofMessageArchive.toJID"
;
// public static final String CONVERSATION_WITH_JID = "c.withJid";
// public static final String CONVERSATION_WITH_JID = "c.withJid";
public
static
final
String
MESSAGE_ID
=
"ofMessageArchive.messageID"
;
public
static
final
String
MESSAGE_ID
=
"ofMessageArchive.messageID"
;
public
static
final
String
MESSAGE_SENT_DATE
=
"ofMessageArchive.sentDate"
;
public
static
final
String
MESSAGE_SENT_DATE
=
"ofMessageArchive.sentDate"
;
...
@@ -126,7 +125,6 @@ public class JdbcPersistenceManager implements PersistenceManager {
...
@@ -126,7 +125,6 @@ public class JdbcPersistenceManager implements PersistenceManager {
// public static final String SELECT_PARTICIPANTS_BY_CONVERSATION =
// public static final String SELECT_PARTICIPANTS_BY_CONVERSATION =
// "SELECT participantId,startTime,endTime,jid FROM archiveParticipants WHERE conversationId =? ORDER BY startTime";
// "SELECT participantId,startTime,endTime,jid FROM archiveParticipants WHERE conversationId =? ORDER BY startTime";
public
static
final
String
SELECT_MESSAGES
=
"SELECT DISTINCT "
+
"ofMessageArchive.fromJID, "
public
static
final
String
SELECT_MESSAGES
=
"SELECT DISTINCT "
+
"ofMessageArchive.fromJID, "
+
"ofMessageArchive.toJID, "
+
"ofMessageArchive.sentDate, "
+
"ofMessageArchive.stanza, "
+
"ofMessageArchive.toJID, "
+
"ofMessageArchive.sentDate, "
+
"ofMessageArchive.stanza, "
+
"ofMessageArchive.messageID, "
+
"ofConParticipant.bareJID "
+
"ofMessageArchive.messageID, "
+
"ofConParticipant.bareJID "
...
@@ -168,7 +166,7 @@ public class JdbcPersistenceManager implements PersistenceManager {
...
@@ -168,7 +166,7 @@ public class JdbcPersistenceManager implements PersistenceManager {
public
Date
getAuditedStartDate
(
Date
startDate
)
{
public
Date
getAuditedStartDate
(
Date
startDate
)
{
long
maxRetrievable
=
JiveGlobals
.
getIntProperty
(
"conversation.maxRetrievable"
,
ConversationManager
.
DEFAULT_MAX_RETRIEVABLE
)
long
maxRetrievable
=
JiveGlobals
.
getIntProperty
(
"conversation.maxRetrievable"
,
ConversationManager
.
DEFAULT_MAX_RETRIEVABLE
)
*
JiveConstants
.
DAY
;
*
JiveConstants
.
DAY
;
Date
result
;
Date
result
=
startDate
;
if
(
maxRetrievable
>
0
)
{
if
(
maxRetrievable
>
0
)
{
Date
now
=
new
Date
();
Date
now
=
new
Date
();
Date
maxRetrievableDate
=
new
Date
(
now
.
getTime
()
-
maxRetrievable
);
Date
maxRetrievableDate
=
new
Date
(
now
.
getTime
()
-
maxRetrievable
);
...
@@ -176,11 +174,7 @@ public class JdbcPersistenceManager implements PersistenceManager {
...
@@ -176,11 +174,7 @@ public class JdbcPersistenceManager implements PersistenceManager {
result
=
maxRetrievableDate
;
result
=
maxRetrievableDate
;
}
else
if
(
startDate
.
before
(
maxRetrievableDate
))
{
}
else
if
(
startDate
.
before
(
maxRetrievableDate
))
{
result
=
maxRetrievableDate
;
result
=
maxRetrievableDate
;
}
else
{
result
=
startDate
;
}
}
}
else
{
result
=
startDate
;
}
}
return
result
;
return
result
;
}
}
...
@@ -887,5 +881,4 @@ public class JdbcPersistenceManager implements PersistenceManager {
...
@@ -887,5 +881,4 @@ public class JdbcPersistenceManager implements PersistenceManager {
return
false
;
return
false
;
}
}
}
}
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