Analizators/s1854

ONLYOFFICE · Jan 21, 2022 · 143f0a5 · 143f0a5
1 parent c05d9fe
commit 143f0a5
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 14 deletions.
diff --git a/common/ASC.Core.Common/Data/DbSubscriptionService.cs b/common/ASC.Core.Common/Data/DbSubscriptionService.cs
@@ -136,7 +136,7 @@ public bool IsUnsubscribe(int tenant, string sourceId, string actionId, string r
             }
             else
             {
-                q = q = q.Where(r => r.Object == string.Empty);
+                q = q.Where(r => r.Object == string.Empty);
             }
 
             return q.Any();

diff --git a/common/ASC.Core.Common/EF/Context/BaseDbContext.cs b/common/ASC.Core.Common/EF/Context/BaseDbContext.cs
@@ -65,7 +65,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
                     {
                         if (!string.IsNullOrEmpty(MigrateAssembly))
                         {
-                            r = r.MigrationsAssembly(MigrateAssembly);
+                            r.MigrationsAssembly(MigrateAssembly);
                         }
                     });
                     break;

diff --git a/common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs b/common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
@@ -261,7 +261,7 @@ private NotifyResult SendNotify(NotifyRequest request, IServiceScope serviceScop
             }
             else
             {
-                result = new NotifyResult(sendResponces.Aggregate((SendResult)0, (s, r) => s |= r.Result), sendResponces);
+                result = new NotifyResult(sendResponces.Aggregate((SendResult)0, (s, r) => r.Result), sendResponces);
             }
             log.Debug(result);
             return result;

diff --git a/common/ASC.Data.Storage/CrossModuleTransferUtility.cs b/common/ASC.Data.Storage/CrossModuleTransferUtility.cs
@@ -90,7 +90,6 @@ public void CopyFile(string srcDomain, string srcPath, string destDomain, string
                             memstream.Seek(0, SeekOrigin.Begin);
                             holder.UploadChunk(session, memstream, chunksize);
                             memstream.Dispose();
-                            memstream = null;
                         }
                     }
                     finally

diff --git a/common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs b/common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
@@ -288,10 +288,6 @@ public override Uri Save(string domain, string path, Stream stream, string conte
                                  ? MimeMapping.GetMimeMapping(Path.GetFileName(path))
                                  : contentType;
 
-            if (mime == "application/octet-stream")
-            {
-                contentDisposition = "attachment";
-            }
 
             var customHeaders = new Dictionary<string, string>();
 

diff --git a/common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs b/common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
@@ -526,7 +526,6 @@ private IBulkIndexOperation<T> GetMeta(BulkIndexDescriptor<T> desc, T data)
                 while (!string.IsNullOrEmpty(name))
                 {
                     sourceExprText = "." + name + sourceExprText;
-                    expression = member.Expression;
                 }
 
                 if (isList)
@@ -581,7 +580,6 @@ private IBulkIndexOperation<T> GetMeta(BulkIndexDescriptor<T> desc, T data)
             while (!string.IsNullOrEmpty(name))
             {
                 sourceExprText = "." + name + sourceExprText;
-                expression = member.Expression;
             }
 
             var parameters = new Dictionary<string, object>();

diff --git a/common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs b/common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
@@ -230,7 +230,7 @@ public void Index(List<T> data, bool immediately = true, int retry = 0)
                         Thread.Sleep(60000);
                         if (retry < 5)
                         {
-                            Index(data, immediately, retry++);
+                            Index(data, immediately, retry + 1);
                             return;
                         }
 
@@ -259,7 +259,7 @@ public void Index(List<T> data, bool immediately = true, int retry = 0)
                         Thread.Sleep(60000);
                         if (retry < 5)
                         {
-                            Index(data, immediately, retry++);
+                            Index(data, immediately, retry + 1);
                             return;
                         }
 
@@ -304,7 +304,7 @@ private async Task InternalIndexAsync(List<T> data, bool immediately, int retry)
                         await Task.Delay(60000);
                         if (retry < 5)
                         {
-                            await IndexAsync(data, immediately, retry++);
+                            await IndexAsync(data, immediately, retry + 1);
                             return;
                         }
 
@@ -333,7 +333,7 @@ private async Task InternalIndexAsync(List<T> data, bool immediately, int retry)
                         await Task.Delay(60000);
                         if (retry < 5)
                         {
-                            await IndexAsync(data, immediately, retry++);
+                            await IndexAsync(data, immediately, retry + 1);
                             return;
                         }