Browse Source

Merge origin/master

Conflicts:
	src/wuerfelthreads/Start.java
	src/wuerfelthreads/view/WuerfelView.form
	src/wuerfelthreads/view/WuerfelView.java
no_lib
BakeOrDie 3 years ago
parent
commit
1cc2478b2b
1 changed files with 1 additions and 1 deletions
  1. 1
    1
      src/graphicChat/model/ChatModel.java

+ 1
- 1
src/graphicChat/model/ChatModel.java View File

try try
{ {
msg = (List<Figure>)objectInput.readObject(); msg = (List<Figure>)objectInput.readObject();
lg.info("Nachricht empfangen" + String.valueOf(msg.size()));
lg.info("Nachricht empfangen: " + String.valueOf(msg.size()));
} }
catch (ClassNotFoundException ex) catch (ClassNotFoundException ex)
{ {

Loading…
Cancel
Save