Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vulnerability fix (powered by Mobb Autofixer) #28

Open
wants to merge 42 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
59107bc
mobb fix commit: 48639d73-6498-43f5-943e-11f46db6b26d
Dec 9, 2024
94c6d60
mobb fix commit: b7cd9976-18fe-46a8-9d94-c31157036a98
Dec 9, 2024
353342e
mobb fix commit: 2857bd87-a1d3-4eba-8f83-819f3e8bfca2
Dec 9, 2024
26ac0c5
mobb fix commit: 38769b97-1588-4f49-9c2d-db070d8b0de2
Dec 9, 2024
df44d52
mobb fix commit: a26177f6-d026-45eb-88ec-f5637f45ea08
Dec 9, 2024
52fbbdf
mobb fix commit: 7932fbcb-f605-461b-aeb1-5042703d4d1d
Dec 9, 2024
6548e38
mobb fix commit: a5e4332f-d5d5-4623-809f-34831a68ce3c
Dec 9, 2024
99a3e76
mobb fix commit: 60cbe74b-84cf-4807-8247-b40f68b4e2d0
Dec 9, 2024
35f2827
mobb fix commit: bea7d18d-fe97-4122-b12b-fadee68ccc08
Dec 9, 2024
19328cc
mobb fix commit: d1a3e8ba-eafe-4409-937d-408cee4b70e3
Dec 9, 2024
3a00ed8
mobb fix commit: 9cf34bb7-7195-4efe-9ab8-d161024145f3
Dec 9, 2024
29531d5
mobb fix commit: 95826f0c-7809-4f7c-b373-283ed9921a97
Dec 9, 2024
9342149
mobb fix commit: bcdfc9ac-6f2d-4581-9792-93cac8a388c1
Dec 9, 2024
0fd7648
mobb fix commit: 8b134075-52dc-4da6-a6d2-965b0bee08b0
Dec 9, 2024
67fe890
mobb fix commit: 4a22e80a-be6d-4d88-ad92-7b00043242fe
Dec 9, 2024
525ed34
mobb fix commit: b6a2ff16-2708-40bc-81e1-d424828e8579
Dec 9, 2024
2d663b7
mobb fix commit: e95dc10e-8edc-4961-b9d1-42bb64c1fc19
Dec 9, 2024
986f8eb
mobb fix commit: 1664bece-aa61-490f-a034-29307f792758
Dec 9, 2024
0824eac
mobb fix commit: 92eff292-9520-445c-806b-ca1f60720d0e
Dec 9, 2024
7d43e09
mobb fix commit: 40466185-cbeb-4b60-8f72-0494be47fb02
Dec 9, 2024
d463670
mobb fix commit: 4c619211-47b8-4d82-99ba-97cfbeaf4c10
Dec 9, 2024
28f93c3
mobb fix commit: 83c1bc53-cc52-47ba-b282-dd6d60db661d
Dec 9, 2024
09f9a50
mobb fix commit: 11d998f7-cecb-4a6d-b0fe-cd29fa5b0c5f
Dec 9, 2024
0cf5f46
mobb fix commit: 9bcdbc1e-310d-4c63-aefd-00e5b552d238
Dec 9, 2024
3706e2f
mobb fix commit: f8569675-6ebc-4510-9da1-82310e74e19b
Dec 9, 2024
88b81a5
mobb fix commit: 5746dab3-58ce-4fa5-b926-2a96057c3796
Dec 9, 2024
cebc3eb
mobb fix commit: 70e95ff3-3fcc-4df2-b75f-f21a6e66a89b
Dec 9, 2024
1d5f8bb
mobb fix commit: 9271d02c-361b-4b93-b9c3-64b21db6f6dc
Dec 9, 2024
4781675
mobb fix commit: 419fd6af-3bd5-4677-8c56-c33f95ac16dd
Dec 9, 2024
e09b64c
mobb fix commit: ef40db6f-b7ce-45ab-920a-74ce9014b93b
Dec 9, 2024
194a2d1
mobb fix commit: f4111d2c-7a3d-4107-95d4-2d57599ae8db
Dec 9, 2024
cb5c0dc
mobb fix commit: 44dbc55a-857c-48c6-994d-557faf61094f
Dec 9, 2024
3f9c970
mobb fix commit: bc7c987b-25d4-4b17-a1bf-4bef6f65445b
Dec 9, 2024
7b2b588
mobb fix commit: 0b1c6966-f379-4915-80ff-c67445b3dbfb
Dec 9, 2024
a6a7b62
mobb fix commit: d465a595-93dc-4e13-9966-8d57f517c2b0
Dec 9, 2024
781efa3
mobb fix commit: 64683159-2f4d-4534-bee1-01cb351c223a
Dec 9, 2024
10b324b
mobb fix commit: 9f539484-0718-4ad3-b498-4520917501fc
Dec 9, 2024
77d1a7c
mobb fix commit: 4cd54614-01c1-4638-bcf1-205c6f87cb7d
Dec 9, 2024
23f722d
mobb fix commit: eee24b28-27a3-4b5f-a158-156c6056472e
Dec 9, 2024
c012e64
mobb fix commit: 5d662aba-a6f2-4835-ac91-09f495d2c69c
Dec 9, 2024
bcf0d17
mobb fix commit: 3c9b629d-bf28-4bf0-ab8f-14c98d019bcb
Dec 9, 2024
107972f
mobb fix commit: 89f116ae-e8e4-4a9f-b712-dcbb72fd74cf
Dec 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ public void run() {
replacePath(sourceModulePath, targetModulePath, allContainerPages);
}
} catch (Throwable e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error("Unexpected error: mobb-58b182ce1384b7d9aad27be7282e92df", e);
getReport().addError(e);
} finally {
cms.getRequestContext().setCurrentProject(currentProject);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ protected String getToNames() {
users.add(userName);
}
} catch (Exception e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error("Unexpected error: mobb-8a763f7e098686ff98790ed0ef38a50c", e);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ private List<CmsUser> getUsers() {
manageableUsers = OpenCms.getRoleManager().getManageableUsers(getCms(), "", true);
} catch (CmsException e) {
if (LOG.isErrorEnabled()) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error("Unexpected error: mobb-afd1cbed8733de8af7c0e966d132f5df", e);
}
}
Iterator<String> itGroups = getGroups().iterator();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ protected void createContentsTable(CmsSetupDb dbCon) throws SQLException {

String dataTablespace = m_poolData.get("dataTablespace");

System.out.println(new Exception().getStackTrace()[0].toString());
System.out.println("Unexpected error: mobb-d4c2f41c17c8190e9d7833cf7e2c8f71");
if (!dbCon.hasTableOrColumn(TABLE_CMS_CONTENTS, null)) {
String query = readQuery(QUERY_CREATE_CMS_CONTENTS_TABLE);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ protected String getColumnProjectIdResourcePath() {
@Override
protected boolean needsUpdating(CmsSetupDb dbCon, String tablename) throws SQLException {

System.out.println(new Exception().getStackTrace()[0].toString());
System.out.println("Unexpected error: mobb-e5ffd810dd53cb312c926c0e0ce3a2c0");
boolean result = true;

String query = readQuery(QUERY_DESCRIBE_TABLE);
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/ade/configuration/CmsADEConfigData.java
Original file line number Diff line number Diff line change
Expand Up @@ -1168,7 +1168,7 @@ public CmsFormatterConfiguration getFormatters(CmsObject cms, CmsResource res) {
OpenCms.getResourceManager().getResourceType(resTypeId),
getFormattersFromSchema(cms, res));
} catch (CmsLoaderException e) {
LOG.warn(e.getLocalizedMessage(), e);
LOG.warn("Unexpected error: mobb-92182983ccc436f121c9e9324aecbb7d", e);
return CmsFormatterConfiguration.EMPTY_CONFIGURATION;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ protected Map<CmsUUID, CmsElementView> loadElementViews() {
}
}
} catch (CmsException e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error("Unexpected error: mobb-96aefe39d217281f409c205a1a692463", e);
}
Collections.sort(views, new CmsElementView.ElementViewComparator());
Map<CmsUUID, CmsElementView> elementViews = new LinkedHashMap<CmsUUID, CmsElementView>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public String getFolderPath(CmsObject cms, String pageFolderPath) {
m_folder.getStructureId(),
cms.getRequestContext().getCurrentProject().isOnlineProject());
} catch (CmsException e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error("Unexpected error: mobb-d244dfa70ccee0efa80edd991bc0a1c2", e);
return m_folder.getRootPath();
}
} else if (m_basePath != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public CmsXmlContent handleChange(
}
}
} catch (CmsException e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error(e.getLocalizedMessage(), "Unexpected error: mobb-c338f2b3b3139265e8e43eadf4c1521f");
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ public static I_CmsCollectorPostCreateHandler getPostCreateHandler(String classN
return new CmsDefaultPostCreateHandler();
}
} catch (Exception e) {
LOG.error("Problem using post-create handler: '" + className + "'," + e.getLocalizedMessage(), e);
LOG.error("Unexpected error: mobb-e4c62601b26128ca9b9eb795c3b4e9bc", e);
return new CmsDefaultPostCreateHandler();
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/gwt/CmsDefaultResourceStatusProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ protected List<CmsResourceStatusRelationBean> getSiblings(CmsObject cms, String
result.add(relationBean);
}
} catch (CmsException e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error("Unexpected error: mobb-49dd46644feb33e0ed50680fa2e85c8d", e);
}
}
return result;
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/importexport/CmsImportVersion10.java
Original file line number Diff line number Diff line change
Expand Up @@ -1038,7 +1038,7 @@ public void associateOrgUnitResources() {
} catch (CmsException e) {
getReport().addWarning(e);
if (LOG.isWarnEnabled()) {
LOG.warn(e.getLocalizedMessage());
LOG.warn("Unexpected error: mobb-2900418c7c91e699c57b8fc4d06b0f03");
}
if (LOG.isDebugEnabled()) {
LOG.debug(e.getLocalizedMessage(), e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ protected String getExtraSolrParams() {
} catch (JSONException e) {
if (null == m_baseConfig) {
if (LOG.isInfoEnabled()) {
LOG.info(Messages.get().getBundle().key(Messages.LOG_NO_EXTRA_PARAMETERS_0), e);
LOG.info(Messages.get().getBundle().key(Messages.LOG_NO_EXTRA_PARAMETERS_0), "Unexpected error: mobb-ab90116fa960066c96ae7a39a8edc836");
}
return "";
} else {
Expand Down Expand Up @@ -1015,7 +1015,7 @@ protected I_CmsSearchConfigurationFacetField parseFieldFacet(JSONObject fieldFac
} catch (JSONException e) {
LOG.error(
Messages.get().getBundle().key(Messages.ERR_FIELD_FACET_MANDATORY_KEY_MISSING_1, JSON_KEY_FACET_FIELD),
e);
"Unexpected error: mobb-5bdc88aa0b6f981e32ebdf08a577bb67");
return null;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/jsp/util/CmsJspElFunctions.java
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ public static String stripHtml(Object input) {
LOG.error(e.getLocalizedMessage(), e);
return "";
} catch (UnsupportedEncodingException e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error(e.getLocalizedMessage(), "Unexpected error: mobb-f3eea761c34e68602058513a3c4ff281");
return "";
}
}
Expand Down
10 changes: 1 addition & 9 deletions src/org/opencms/monitor/CmsMemoryMonitor.java
Original file line number Diff line number Diff line change
Expand Up @@ -2695,15 +2695,7 @@ protected void monitorWriteLog(boolean warning) {

if (warning) {
LOG.warn(
Messages.get().getBundle().key(
Messages.LOG_MM_WARNING_MEM_STATUS_6,
new Object[] {
Long.valueOf(m_memoryCurrent.getMaxMemory()),
Long.valueOf(m_memoryCurrent.getTotalMemory()),
Long.valueOf(m_memoryCurrent.getFreeMemory()),
Long.valueOf(m_memoryCurrent.getUsedMemory()),
Long.valueOf(m_memoryCurrent.getUsage()),
Integer.valueOf(m_maxUsagePercent)}));
"Unexpected error: mobb-dfa733422ee1391cbc21928cec982c7a");
} else {
m_logCount++;
LOG.info(
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/pdftools/CmsPdfUserAgent.java
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ private byte[] readFile(String uriWithParams) {
CmsFile file = m_rootCms.readFile(path);
return file.getContents();
} catch (Exception e) {
LOG.error("Problem with reading CSS " + uriWithParams + ": " + e.getLocalizedMessage(), e);
LOG.error("Problem with reading CSS " + uriWithParams + ": " + e.getLocalizedMessage(), "Unexpected error: mobb-1cd414f4ece2ece887c236e0b3072e38");
return null;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/publish/CmsPublishQueue.java
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ protected void remove(CmsPublishJobInfoBean publishJob) throws CmsException {
m_publishEngine.getDriverManager().deletePublishJob(dbc, publishJob.getPublishHistoryId());
} catch (CmsException e) {
dbc.rollback();
LOG.error(e.getLocalizedMessage(), e);
LOG.error("Unexpected error: mobb-4e69ba6bf104845363a0d8e41f81a01d", e);
throw e;
} finally {
dbc.clear();
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/search/CmsSearchManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -1022,7 +1022,7 @@ public void cmsEvent(CmsEvent event) {
Messages.get().getBundle().key(
Messages.ERR_EVENT_REBUILD_SEARCHINDEX_1,
indexNames == null ? "" : CmsStringUtil.collectionAsString(indexNames, ",")),
e);
"Unexpected error: mobb-5ca55b43e190a53dff565882e0f6933a");
}
}
break;
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/search/solr/CmsSolrDocument.java
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ public void addSearchField(CmsSearchField sfield, String value) {
val = CmsSearchUtil.getDateAsIso8601(Long.valueOf(val).longValue());
}
} catch (SolrException e) {
LOG.debug(e.getMessage(), e);
LOG.debug(e.getMessage(), "Unexpected error: mobb-ab1daaac6e6abd8110217fea626ecae9");
throw new RuntimeException(e);
}
if (fieldName.endsWith(CmsSearchField.FIELD_EXCERPT)) {
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/search/solr/CmsSolrFieldConfiguration.java
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ protected I_CmsSearchDocument appendAdditionalValuesToDcoument(
}
}
} catch (CmsException e) {
LOG.error(e.getMessage(), e);
LOG.error("Unexpected error: mobb-99eeeb568e9af5c0cf0e339d274dab0b", e);
}

List<String> searchExcludeOptions = document.getMultivaluedFieldAsStringList(
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/staticexport/CmsStaticExportManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -2269,7 +2269,7 @@ public void setHandler(String handlerClassName) {
m_handler = (I_CmsStaticExportHandler)Class.forName(handlerClassName).newInstance();
} catch (Exception e) {
// should never happen
LOG.error(e.getLocalizedMessage(), e);
LOG.error(e.getLocalizedMessage(), "Unexpected error: mobb-00459aaccc09d2bf63c04f72d6299f39");
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/ui/CmsUserIconHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ private String getIconPath(CmsObject cms, CmsUser user, IconSize size) {
try {
m_cache.saveCacheFile(rfsName, getImageBytes(icon));
} catch (Exception e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error(e.getLocalizedMessage(), "Unexpected error: mobb-b4f4b541479b84da4a42161050156796");
}
}
return path;
Expand Down
4 changes: 2 additions & 2 deletions src/org/opencms/ui/apps/CmsFileExplorer.java
Original file line number Diff line number Diff line change
Expand Up @@ -1594,7 +1594,7 @@ void readTreeLevel(CmsUUID parentId, String openPathFragment) {
m_fileTree.markAsDirtyRecursive();
} catch (CmsException e) {
CmsErrorDialog.showErrorDialog(e);
LOG.error(e.getLocalizedMessage(), e);
LOG.error(e.getLocalizedMessage(), "Unexpected error: mobb-b73343f5ba8319db93e4fdcc57ae6b81");
}
}

Expand Down Expand Up @@ -1643,7 +1643,7 @@ void showParentFolder() {
CmsErrorDialog.showErrorDialog(
CmsVaadinUtils.getMessageText(Messages.ERR_EXPLORER_CAN_NOT_READ_RESOURCE_1, parentId),
e);
LOG.error(e.getLocalizedMessage(), e);
LOG.error("Unexpected error: mobb-381607710c74915fd73b0ec3af3498ae", e);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/ui/apps/dbmanager/A_CmsImportForm.java
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ protected CmsObject getCmsObject() {
cms.getRequestContext().setCurrentProject(cms.readProject((CmsUUID)getProjectSelector().getValue()));
return cms;
} catch (CmsException e) {
LOG.error("Unable to get CmsObject", e);
LOG.error("Unable to get CmsObject", "Unexpected error: mobb-64e99b76799edfaf7489b0bd33c5d663");
}
return null;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ CmsModuleResourceSelectField createModuleResourceField(String moduleResource) {
}
return resField;
} catch (CmsException e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error("Unexpected error: mobb-51f7208319bb238b3a48f2b993b6914f", e);
return null;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ public void validate(Object value) throws InvalidValueException {
}
}
} catch (CmsException e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error(e.getLocalizedMessage(), "Unexpected error: mobb-77303d846a26df91edad032b84e0a236");
}
}
m_notificationPanel.setVisible(showNotification);
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/ui/dialogs/embedded/CmsDataViewParams.java
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public CmsDataViewParams(I_CmsDialogContext context) {
m_viewArg = json.optString(CmsDataViewConstants.CONFIG_VIEW_ARG);
m_multiSelect = json.optString(CmsDataViewConstants.CONFIG_MULTI_SELECT);
} catch (JSONException e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error("Unexpected error: mobb-7f8eb1d78f4d3eb8c626cfcfa72d3d9d", e);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/ui/dialogs/history/diff/CmsValueDiff.java
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ private Component buildWholeFileDiffView(CmsObject cms, CmsFile file1, CmsFile f
} catch (CmsException e) {
String rootPath = file1.getRootPath();
LOG.error(
"Could not unmarshal file " + rootPath + " for determining encoding: " + e.getLocalizedMessage(),
"Unexpected error: mobb-e1e2b1945c966e8f28b875376e48321b",
e);
}
String text1 = decode(file1.getContents(), encoding);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,7 @@ public static CmsResource getDescriptor(CmsObject cms, String basename) {
: CmsSolrIndex.DEFAULT_INDEX_NAME_OFFLINE;
results = OpenCms.getSearchManager().getIndexSolr(indexName).search(cms, query, true, null, true, null);
} catch (CmsSearchException e) {
LOG.error(Messages.get().getBundle().key(Messages.ERR_BUNDLE_DESCRIPTOR_SEARCH_ERROR_0), e);
LOG.error(Messages.get().getBundle().key(Messages.ERR_BUNDLE_DESCRIPTOR_SEARCH_ERROR_0), "Unexpected error: mobb-a086e02f8643bc71961cfca16831170b");
return null;
}

Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/ui/login/CmsLoginController.java
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ protected void handleError(CmsObject currentCms, String user, Exception e) {
// any other error - display default message
message = org.opencms.workplace.Messages.get().container(
org.opencms.workplace.Messages.GUI_LOGIN_FAILED_0);
LOG.warn(e.getLocalizedMessage(), e);
LOG.warn("Unexpected error: mobb-5be5e2b683dcfea621dc9a3f7761de54", e);
displayError(message.key(m_params.getLocale()), true, true);
CmsUserLog.logLoginFailure(currentCms, user);
return;
Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/ui/sitemap/CmsUnlinkDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public CmsUnlinkDialog(I_CmsDialogContext context, CmsResource otherResource) {
}
}
} catch (CmsException e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error(e.getLocalizedMessage(), "Unexpected error: mobb-fea1e4a0c5ed0dbfd00efe131a5dafbf");
}
CmsResource rightResource = m_otherResource;
CmsResourceInfo left = new CmsResourceInfo(leftResource);
Expand Down
6 changes: 3 additions & 3 deletions src/org/opencms/util/CmsHtmlConverter.java
Original file line number Diff line number Diff line change
Expand Up @@ -283,19 +283,19 @@ public String convertToString(String htmlInput) throws UnsupportedEncodingExcept
org.opencms.loader.Messages.get().getBundle().key(
org.opencms.loader.Messages.LOG_HTML_CONVERTER_CLASS_NOT_FOUND_1,
className),
e);
"Unexpected error: mobb-9a9126516f8ddbc2abde0ad54f3afcdd");
} catch (IllegalAccessException e) {
LOG.error(
org.opencms.loader.Messages.get().getBundle().key(
org.opencms.loader.Messages.LOG_HTML_CONVERTER_CLASS_NOT_FOUND_1,
className),
e);
"Unexpected error: mobb-041c13f3fa7282ccae2cff079e796290");
} catch (InstantiationException e) {
LOG.error(
org.opencms.loader.Messages.get().getBundle().key(
org.opencms.loader.Messages.LOG_HTML_CONVERTER_CLASS_NOT_FOUND_1,
className),
e);
"Unexpected error: mobb-c9b1a439e74337c083e195a5f5cb356f");
}
}
return htmlInput;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public synchronized void receiveSample(String sampleName, long sampleTime) {
+ "\n";
fw.write(line);
} catch (IOException e) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error(e.getLocalizedMessage(), "Unexpected error: mobb-63d11204453b8fcda9eb06167e79867f");
e.printStackTrace();
}

Expand Down
2 changes: 1 addition & 1 deletion src/org/opencms/workplace/CmsWorkplace.java
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,7 @@ public static CmsWorkplaceSettings initUserSettings(CmsObject cms, CmsWorkplaceS
} catch (CmsException e) {
// can usually be ignored
if (LOG.isInfoEnabled()) {
LOG.info(e.getLocalizedMessage());
LOG.info("Unexpected error: mobb-4b594453b5d86d0da40132d327c83b3c");
}
user = cms.getRequestContext().getCurrentUser();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public void run() {
}
} catch (Throwable e) {
report.println(e);
LOG.error(Messages.get().getBundle().key(Messages.LOG_MODULE_DELETE_FAILED_1, m_moduleNames), e);
LOG.error(Messages.get().getBundle().key(Messages.LOG_MODULE_DELETE_FAILED_1, m_moduleNames), "Unexpected error: mobb-00c8c248162d5be6b9ee23e1af2d681a");
} finally {
OpenCms.getSearchManager().resumeOfflineIndexing(pauseId);
}
Expand Down
4 changes: 2 additions & 2 deletions src/org/opencms/workplace/threads/CmsModuleReplaceThread.java
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public void run() {
} catch (InterruptedException e) {
// should never happen
if (LOG.isErrorEnabled()) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error(e.getLocalizedMessage(), "Unexpected error: mobb-54c6da9de80bc6a152e868d26070d6c1");
}
}
// get remaining report contents
Expand All @@ -148,7 +148,7 @@ public void run() {
} catch (InterruptedException e) {
// should never happen
if (LOG.isErrorEnabled()) {
LOG.error(e.getLocalizedMessage(), e);
LOG.error(e.getLocalizedMessage(), "Unexpected error: mobb-92341d676b0ae5ace1feb3657bbe5236");
}
}
if (LOG.isDebugEnabled()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public void run() {
I_CmsReport.FORMAT_ERROR);
getReport().println(f);
if (LOG.isErrorEnabled()) {
LOG.error(f);
LOG.error("Unexpected error: mobb-dabe0f0d5f9573ef5d9459e4258c338e");
}
}

Expand Down
Loading