Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OLAT CI-CD Testing Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lars Oliver Dam
OLAT CI-CD Testing Project
Commits
1142dcc1
Commit
1142dcc1
authored
11 years ago
by
srosse
Browse files
Options
Downloads
Patches
Plain Diff
OO-959: check if the item exists to prevent NPE
parent
adf39923
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/org/olat/modules/webFeed/FeedViewHelper.java
+26
-7
26 additions, 7 deletions
src/main/java/org/olat/modules/webFeed/FeedViewHelper.java
with
26 additions
and
7 deletions
src/main/java/org/olat/modules/webFeed/FeedViewHelper.java
+
26
−
7
View file @
1142dcc1
...
@@ -187,6 +187,9 @@ public class FeedViewHelper {
...
@@ -187,6 +187,9 @@ public class FeedViewHelper {
// Reload item to prevent displaying of stale content
// Reload item to prevent displaying of stale content
feed
=
feedManager
.
getFeed
(
feed
);
feed
=
feedManager
.
getFeed
(
feed
);
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
if
(
item
==
null
)
{
return
null
;
}
String
file
=
null
;
String
file
=
null
;
Enclosure
enclosure
=
item
.
getEnclosure
();
Enclosure
enclosure
=
item
.
getEnclosure
();
...
@@ -243,7 +246,7 @@ public class FeedViewHelper {
...
@@ -243,7 +246,7 @@ public class FeedViewHelper {
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
String
lastModified
=
null
;
String
lastModified
=
null
;
Date
date
=
item
.
getLastModified
();
Date
date
=
item
==
null
?
null
:
item
.
getLastModified
();
if
(
date
!=
null
)
{
if
(
date
!=
null
)
{
lastModified
=
DateFormat
.
getDateInstance
(
DateFormat
.
MEDIUM
,
this
.
locale
).
format
(
date
);
lastModified
=
DateFormat
.
getDateInstance
(
DateFormat
.
MEDIUM
,
this
.
locale
).
format
(
date
);
}
}
...
@@ -258,6 +261,9 @@ public class FeedViewHelper {
...
@@ -258,6 +261,9 @@ public class FeedViewHelper {
// Reload item to prevent displaying of stale content
// Reload item to prevent displaying of stale content
feed
=
feedManager
.
getFeed
(
feed
);
feed
=
feedManager
.
getFeed
(
feed
);
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
if
(
item
==
null
)
{
return
""
;
}
String
publishDate
=
null
;
String
publishDate
=
null
;
Date
date
=
item
.
getPublishDate
();
Date
date
=
item
.
getPublishDate
();
...
@@ -275,6 +281,9 @@ public class FeedViewHelper {
...
@@ -275,6 +281,9 @@ public class FeedViewHelper {
// Reload item to prevent displaying of stale content
// Reload item to prevent displaying of stale content
feed
=
feedManager
.
getFeed
(
feed
);
feed
=
feedManager
.
getFeed
(
feed
);
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
if
(
item
==
null
)
{
return
""
;
}
String
info
=
null
;
String
info
=
null
;
String
date
=
getPublishDate
(
item
);
String
date
=
getPublishDate
(
item
);
...
@@ -305,7 +314,10 @@ public class FeedViewHelper {
...
@@ -305,7 +314,10 @@ public class FeedViewHelper {
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
String
info
=
null
;
String
info
=
null
;
if
(
item
.
isDraft
())
{
if
(
item
==
null
)
{
//oops deleted
info
=
""
;
}
else
if
(
item
.
isDraft
())
{
info
=
translator
.
translate
(
"feed.item.draft"
);
info
=
translator
.
translate
(
"feed.item.draft"
);
}
else
if
(
item
.
isScheduled
())
{
}
else
if
(
item
.
isScheduled
())
{
info
=
translator
.
translate
(
"feed.item.scheduled.for"
,
new
String
[]
{
getPublishDate
(
item
)
});
info
=
translator
.
translate
(
"feed.item.scheduled.for"
,
new
String
[]
{
getPublishDate
(
item
)
});
...
@@ -319,8 +331,7 @@ public class FeedViewHelper {
...
@@ -319,8 +331,7 @@ public class FeedViewHelper {
// Reload item to prevent displaying of stale content
// Reload item to prevent displaying of stale content
feed
=
feedManager
.
getFeed
(
feed
);
feed
=
feedManager
.
getFeed
(
feed
);
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
return
item
!=
null
&&
item
.
getModifierKey
()
>
0
&&
StringHelper
.
containsNonWhitespace
(
item
.
getModifier
());
return
item
.
getModifierKey
()
>
0
&&
StringHelper
.
containsNonWhitespace
(
item
.
getModifier
());
}
}
/**
/**
...
@@ -331,6 +342,9 @@ public class FeedViewHelper {
...
@@ -331,6 +342,9 @@ public class FeedViewHelper {
// Reload item to prevent displaying of stale content
// Reload item to prevent displaying of stale content
feed
=
feedManager
.
getFeed
(
feed
);
feed
=
feedManager
.
getFeed
(
feed
);
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
if
(
item
==
null
)
{
return
""
;
}
if
(
isModified
(
item
))
{
if
(
isModified
(
item
))
{
String
date
=
getLastModified
(
item
);
String
date
=
getLastModified
(
item
);
...
@@ -356,8 +370,7 @@ public class FeedViewHelper {
...
@@ -356,8 +370,7 @@ public class FeedViewHelper {
// Reload item to prevent displaying of stale content
// Reload item to prevent displaying of stale content
feed
=
feedManager
.
getFeed
(
feed
);
feed
=
feedManager
.
getFeed
(
feed
);
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
int
width
=
item
==
null
?
0
:
item
.
getWidth
();
int
width
=
item
.
getWidth
();
if
(
width
>
0
&&
width
<
2000
)
{
if
(
width
>
0
&&
width
<
2000
)
{
return
Integer
.
toString
(
width
);
return
Integer
.
toString
(
width
);
}
}
...
@@ -369,7 +382,7 @@ public class FeedViewHelper {
...
@@ -369,7 +382,7 @@ public class FeedViewHelper {
feed
=
feedManager
.
getFeed
(
feed
);
feed
=
feedManager
.
getFeed
(
feed
);
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
int
height
=
item
.
getHeight
();
int
height
=
item
==
null
?
0
:
item
.
getHeight
();
if
(
height
>
0
&&
height
<
2000
)
{
if
(
height
>
0
&&
height
<
2000
)
{
return
Integer
.
toString
(
height
);
return
Integer
.
toString
(
height
);
}
}
...
@@ -415,6 +428,9 @@ public class FeedViewHelper {
...
@@ -415,6 +428,9 @@ public class FeedViewHelper {
// Reload item to prevent displaying of stale content
// Reload item to prevent displaying of stale content
feed
=
feedManager
.
getFeed
(
feed
);
feed
=
feedManager
.
getFeed
(
feed
);
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
if
(
item
==
null
)
{
return
""
;
}
String
itemDescription
=
item
.
getDescription
();
String
itemDescription
=
item
.
getDescription
();
if
(
itemDescription
!=
null
)
{
if
(
itemDescription
!=
null
)
{
...
@@ -444,6 +460,9 @@ public class FeedViewHelper {
...
@@ -444,6 +460,9 @@ public class FeedViewHelper {
// Reload item to prevent displaying of stale content
// Reload item to prevent displaying of stale content
feed
=
feedManager
.
getFeed
(
feed
);
feed
=
feedManager
.
getFeed
(
feed
);
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
item
=
feedManager
.
getItem
(
feed
,
item
.
getGuid
());
if
(
item
==
null
)
{
return
""
;
}
String
itemContent
=
item
.
getContent
();
String
itemContent
=
item
.
getContent
();
if
(
itemContent
!=
null
)
{
if
(
itemContent
!=
null
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment