Skip to content

Commit 193e55b

Browse files
committed
Feature #2815 & #3146 : adding transverse file filter
- fixing some bad behaviors on creation or updating of messages from the Forums applications - refactoring some code
1 parent 97385f7 commit 193e55b

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

forums/forums-war/src/main/java/com/stratelia/webactiv/forums/control/ForumsSessionController.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ public int createMessage(String title, String author, int forumId, int parentId,
445445
String status = STATUS_FOR_VALIDATION;
446446

447447
MessagePK messagePK = new MessagePK(getComponentId(), getSpaceId());
448-
int messageId;
448+
int messageId = 0;
449449

450450
try {
451451
if (!isValidationActive() || admin.isInRole(getUserRoleLevel()) ||
@@ -455,8 +455,9 @@ public int createMessage(String title, String author, int forumId, int parentId,
455455
// creation du message dans la base
456456
messageId = getForumsBM().createMessage(messagePK, truncateTextField(title),
457457
author, null, forumId, parentId, text, keywords, status);
458-
} catch (ForumsException e) {
459-
throw new EJBException(e.getMessage(), e);
458+
} catch (Exception e) {
459+
SilverpeasTransverseErrorUtil.stopTransverseErrorIfAny(new EJBException(e.getMessage(), e));
460+
return messageId;
460461
}
461462
messagePK.setId(String.valueOf(messageId));
462463

@@ -502,8 +503,9 @@ public void updateMessage(int messageId, String title, String text, String statu
502503
}
503504
getForumsBM().updateMessage(messagePK, truncateTextField(title), text,
504505
getUserId(), currentStatus);
505-
} catch (ForumsException e) {
506-
throw new EJBException(e.getMessage(), e);
506+
} catch (Exception e) {
507+
SilverpeasTransverseErrorUtil.stopTransverseErrorIfAny(new EJBException(e.getMessage(), e));
508+
return;
507509
}
508510

509511
// Send notification to subscribers

forums/forums-war/src/main/java/com/stratelia/webactiv/forums/control/helpers/ForumActionHelper.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -209,15 +209,12 @@ private static void actionManagement(int action, int params, HttpServletRequest
209209
if (StringUtil.isDefined(messageTitle) && StringUtil.isDefined(messageText)) {
210210
Collection<UploadedFile> uploadedFiles = FileUploadManager.getUploadedFiles(request,
211211
fsc.getUserDetail());
212-
int result =
212+
int messageId =
213213
fsc.createMessage(messageTitle, userId, forumId, parentId, messageText,
214214
forumKeywords, uploadedFiles);
215-
if (subscribe == null) {
216-
subscribe = "0";
217-
} else {
218-
subscribe = "1";
219-
if (result != 0) {
220-
fsc.subscribeMessage(result);
215+
if (subscribe != null) {
216+
if (messageId != 0) {
217+
fsc.subscribeMessage(messageId);
221218
}
222219
}
223220
if (parentId > 0) {

silvercrawler/silvercrawler-war/src/main/java/com/silverpeas/silvercrawler/control/SilverCrawlerSessionController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import org.silverpeas.search.searchEngine.model.MatchingIndexEntry;
5656
import org.silverpeas.search.searchEngine.model.QueryDescription;
5757
import org.silverpeas.util.UnitUtil;
58+
import org.silverpeas.util.memory.MemoryUnit;
5859

5960
import java.io.File;
6061
import java.io.IOException;
@@ -243,7 +244,7 @@ public FolderZIPInfo zipFolder(String folderName) {
243244
SilverTrace.debug("silverCrawler", "SilverCrawlerSessionController.zipFolder()",
244245
"root.MSG_GEN_PARAM_VALUE", "fileZip = " + zipFile.getName());
245246

246-
long sizeMax = UnitUtil.convertTo(getSizeMax(), UnitUtil.memUnit.MB, UnitUtil.memUnit.B);
247+
long sizeMax = UnitUtil.convertTo(getSizeMax(), MemoryUnit.MB, MemoryUnit.B);
247248
long zipSize = 0;
248249
String url = "";
249250
SilverTrace.debug("silverCrawler",

0 commit comments

Comments
 (0)