[openmeetings] branch master updated: no jira: logging is improved

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 6c87a29  no jira: logging is improved
6c87a29 is described below

commit 6c87a292c538dfe51864b6ca8b2f6ce52d291d81
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri May 11 10:28:12 2018 +0700

    no jira: logging is improved
---
 .../java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
index 24beb6c..ba58bb8 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
@@ -53,6 +53,8 @@ import 
org.apache.wicket.request.resource.JavaScriptResourceReference;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.wicket.util.lang.Bytes;
 import org.apache.wicket.util.string.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.googlecode.wicket.jquery.core.Options;
 import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
@@ -61,6 +63,7 @@ import 
com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
 
 public class UploadDialog extends AbstractFormDialog<String> {
        private static final long serialVersionUID = 1L;
+       private static final Logger log = 
LoggerFactory.getLogger(UploadDialog.class);
        private final KendoFeedbackPanel feedback = new 
KendoFeedbackPanel("feedback", new Options("button", true));
        private final Form<String> form;
        private DialogButton upload;
@@ -215,7 +218,8 @@ public class UploadDialog extends 
AbstractFormDialog<String> {
                                                }
                                        }
                                } catch (Exception e) {
-                                       form.error(e.getMessage());
+                                       log.error("Unexpected error while 
processing uploaded file", e);
+                                       form.error(e.getMessage() == null ? 
"Unexpected error" : e.getMessage());
                                } finally {
                                        fu.closeStreams();
                                        fu.delete();

-- 
To stop receiving notification emails like this one, please contact
solo...@apache.org.